Merge branch 'main' into feat/filament_dialog_fix

This commit is contained in:
Lam Wei Lun
2026-09-23 16:23:01 +08:00
3380 changed files with 208675 additions and 270512 deletions
+7 -1
View File
@@ -138,7 +138,13 @@ PROFILE_SUBDIRS = ("filament", "process", "machine")
PROFILE_TYPES = ("machine_model", "process", "filament", "machine")
# Data files that sit under a vendor bundle but are not presets: no name, no type.
NON_PROFILE_FILES = {"filaments_color_codes.json", "cli_config.json"}
NON_PROFILE_FILES = {
"filaments_color_codes.json",
"cli_config.json",
"filament_id_map.json",
"filament_name_map.json",
"support_recommended_params.json",
}
# Mirror PrintConfigDef::handle_legacy's ignore set in PrintConfig.cpp; a test
# checks parity. Used by normalize and check. Active options and