Merge remote-tracking branch 'origin/main' into feature/texdisp-model-uv

# Conflicts: # src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp
Take the tile-size row through the typed slider's tooltip argument
2026-10-12 18:31:18 +00:00 · 2026-10-12 15:15:34 +02:00 · 2026-10-12 15:14:50 +02:00 · 2026-10-12 20:27:37 +08:00 · 2026-10-12 14:11:15 +02:00 · 2026-10-12 20:03:43 +08:00
125 changed files with 2746 additions and 10858 deletions
@@ -1,10 +1,18 @@
 # ccache does not parse the -clang: arguments CMake uses for clang-cl's gcc-style
 # depfile, so a cache hit writes the object and no depfile, and Ninja then records
 # no headers for that object. ccache reproduces /showIncludes output on a hit.
+#
+# Clang also records the modification time of every input in a precompiled header
+# and rejects the header once one differs. ccache caches the compile that creates
+# the header, so a tree that regenerates cmake_pch.cxx gets back a header stamped
+# with the old file's time, and every compile that uses it fails. The build system
+# already rebuilds the header when an input changes. This covers the dependencies,
+# such as wxWidgets; PrecompiledHeader.cmake does the same for OrcaSlicer's targets.
 foreach (_lang C CXX)
    if (CMAKE_${_lang}_COMPILER_ID STREQUAL "Clang" AND
        CMAKE_${_lang}_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
        set(CMAKE_DEPFILE_FLAGS_${_lang} "/showIncludes")
        set(CMAKE_${_lang}_DEPFILE_FORMAT msvc)
+        list(APPEND CMAKE_${_lang}_COMPILE_OPTIONS_CREATE_PCH -Xclang -fno-pch-timestamp)
    endif ()
 endforeach ()
@@ -131,13 +131,6 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>OrcaSlicer uses your local network to discover and connect to printers.</string>
-	<key>NSBonjourServices</key>
-	<array>
-		<string>_octoprint._tcp</string>
-		<string>_http._tcp</string>
-	</array>
 	<key>NSAppTransportSecurity</key>  
 	<dict>
 		<!-- Disable App Transport Security. Resolves https://github.com/OrcaSlicer/OrcaSlicer/issues/791 -->
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3999,15 +3999,6 @@ msgstr ""
 msgid "Go to Plate"
 msgstr ""

-msgid "Device"
-msgstr ""
-
-msgid "Device (Web)"
-msgstr ""
-
-msgid "Multi-device"
-msgstr ""
-
 msgid "AMS Materials Setting"
 msgstr ""

@@ -4056,9 +4047,6 @@ msgstr ""
 msgid "You need to select the material type and color first."
 msgstr ""

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, possible-c-format, possible-boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr ""
@@ -4067,12 +4055,6 @@ msgstr ""
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr ""

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6003,9 +5985,18 @@ msgstr ""
 msgid "Preview"
 msgstr ""

+msgid "Device"
+msgstr ""
+
+msgid "Multi-device"
+msgstr ""
+
 msgid "Project"
 msgstr ""

+msgid "Device (Web)"
+msgstr ""
+
 msgid "Yes"
 msgstr ""

@@ -6679,22 +6670,6 @@ msgstr ""
 msgid "File '%s' was lost! Please download it again."
 msgstr ""

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, possible-c-format, possible-boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, possible-c-format, possible-boost-format
 msgid ""
 "File: %s\n"
@@ -10367,12 +10342,6 @@ msgstr ""
 msgid "Clean Up"
 msgstr ""

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr ""

@@ -27238,9 +27207,6 @@ msgstr ""
 msgid "An error occurred loading %s"
 msgstr ""

-msgid "/"
-msgstr ""
-
 #, possible-boost-format
 msgid "Load %1% to %2%"
 msgstr ""
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2025-03-15 10:55+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -4375,16 +4375,6 @@ msgstr "Projectes recents"
 msgid "Go to Plate"
 msgstr "Anar a la placa"

-msgid "Device"
-msgstr "Dispositiu"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Dispositiu (Web)"
-
-msgid "Multi-device"
-msgstr "Multidispositiu"
-
 msgid "AMS Materials Setting"
 msgstr "Configuració de materials AMS"

@@ -4433,9 +4423,6 @@ msgstr "Estàs segur que vols esborrar la informació del filament?"
 msgid "You need to select the material type and color first."
 msgstr "Primer heu de seleccionar el tipus de material i el color."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Introduïu un valor vàlid (K a %.1f~%.1f)"
@@ -4444,12 +4431,6 @@ msgstr "Introduïu un valor vàlid (K a %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Introduïu un valor vàlid (K a %.1f~%.1f, N a %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6525,9 +6506,19 @@ msgstr "Preparació"
 msgid "Preview"
 msgstr "Previsualització"

+msgid "Device"
+msgstr "Dispositiu"
+
+msgid "Multi-device"
+msgstr "Multidispositiu"
+
 msgid "Project"
 msgstr "Projecte"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Dispositiu (Web)"
+
 msgid "Yes"
 msgstr "Sí"

@@ -7234,22 +7225,6 @@ msgstr "El fitxer .gcode.3mf no conté dades de G-code. Lamineu-lo amb Orca Slic
 msgid "File '%s' was lost! Please download it again."
 msgstr "L'arxiu '%s' s'ha perdut! Si us plau, descarregueu-lo de nou."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11436,12 +11411,6 @@ msgstr "Cancel·lar el timelapse i imprimir"
 msgid "Clean Up"
 msgstr "Netejar"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Preparant el treball d'impressió"

@@ -31549,9 +31518,6 @@ msgstr "Activar les eines de desenvolupament"
 msgid "An error occurred loading %s"
 msgstr "S'ha produït un error en carregar %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33619,6 +33585,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "S'ha produït un error en carregar "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Jakub Hencl\n"
 "Language-Team: \n"
@@ -4331,16 +4331,6 @@ msgstr "Nedávné projekty"
 msgid "Go to Plate"
 msgstr "Přejít na desku"

-msgid "Device"
-msgstr "Zařízení"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Zařízení (Web)"
-
-msgid "Multi-device"
-msgstr "Více zařízení"
-
 msgid "AMS Materials Setting"
 msgstr "Nastavení materiálů AMS"

@@ -4391,9 +4381,6 @@ msgstr "Opravdu chcete vymazat informace o filamentu?"
 msgid "You need to select the material type and color first."
 msgstr "Nejprve musíte vybrat typ materiálu a barvu."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Zadejte platnou hodnotu (K v rozsahu %.1f~%.1f)"
@@ -4402,12 +4389,6 @@ msgstr "Zadejte platnou hodnotu (K v rozsahu %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Zadejte platnou hodnotu (K v rozsahu %.1f~%.1f, N v rozsahu %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6501,9 +6482,19 @@ msgstr "Připravit"
 msgid "Preview"
 msgstr "Náhled"

+msgid "Device"
+msgstr "Zařízení"
+
+msgid "Multi-device"
+msgstr "Více zařízení"
+
 msgid "Project"
 msgstr "Projekt"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Zařízení (Web)"
+
 msgid "Yes"
 msgstr "Ano"

@@ -7214,22 +7205,6 @@ msgstr "Soubor .gcode.3mf neobsahuje žádná G-code data. Prosím, rozřežte m
 msgid "File '%s' was lost! Please download it again."
 msgstr "Soubor '%s' byl ztracen! Stáhněte jej prosím znovu."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11405,12 +11380,6 @@ msgstr "Zrušit časosběr a tisknout"
 msgid "Clean Up"
 msgstr "Vyčistit"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Příprava tiskové úlohy"

@@ -31563,10 +31532,6 @@ msgstr "Povolit vývojářské nástroje"
 msgid "An error occurred loading %s"
 msgstr "Při načítání %s došlo k chybě"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33636,6 +33601,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Při načítání došlo k chybě: "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Heiko Liebscher <hliebschergmail.com>\n"
 "Language-Team: \n"
@@ -4246,16 +4246,6 @@ msgstr "Zuletzt verwendete Projekte"
 msgid "Go to Plate"
 msgstr "Zur Druckplatte wechseln"

-msgid "Device"
-msgstr "Gerät"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Gerät (Web)"
-
-msgid "Multi-device"
-msgstr "Multi-Gerät"
-
 msgid "AMS Materials Setting"
 msgstr "AMS Material Einstellung"

@@ -4304,9 +4294,6 @@ msgstr "Sind Sie sicher, dass Sie die Filamentinformationen löschen möchten?"
 msgid "You need to select the material type and color first."
 msgstr "Sie müssen zuerst den Materialtyp und die Farbe auswählen."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Bitte geben Sie einen gültigen Wert ein (K in %.1f~%.1f)"
@@ -4315,12 +4302,6 @@ msgstr "Bitte geben Sie einen gültigen Wert ein (K in %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Bitte geben Sie einen gültigen Wert ein (K in %.1f~%.1f, N in %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6383,9 +6364,19 @@ msgstr "Vorbereiten"
 msgid "Preview"
 msgstr "Vorschau"

+msgid "Device"
+msgstr "Gerät"
+
+msgid "Multi-device"
+msgstr "Multi-Gerät"
+
 msgid "Project"
 msgstr "Projekt"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Gerät (Web)"
+
 msgid "Yes"
 msgstr "Ja"

@@ -7081,22 +7072,6 @@ msgstr "Die .gcode.3mf-Datei enthält keine G-Code-Daten. Bitte slicen Sie sie m
 msgid "File '%s' was lost! Please download it again."
 msgstr "Die Datei '%s' ist verloren gegangen! Bitte laden Sie diese erneut herunter."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11221,12 +11196,6 @@ msgstr "Zeitraffer abbrechen & Drucken"
 msgid "Clean Up"
 msgstr "Bereinigen"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Druckauftrag vorbereiten"

@@ -30950,9 +30919,6 @@ msgstr "Entwicklertools aktivieren"
 msgid "An error occurred loading %s"
 msgstr "Fehler beim Laden von %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33014,6 +32980,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Fehler beim Laden von "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-06-17 15:44-0300\n"
 "Last-Translator: Alexandre Folle de Menezes\n"
 "Language-Team: \n"
@@ -3995,15 +3995,6 @@ msgstr ""
 msgid "Go to Plate"
 msgstr ""

-msgid "Device"
-msgstr ""
-
-msgid "Device (Web)"
-msgstr ""
-
-msgid "Multi-device"
-msgstr ""
-
 msgid "AMS Materials Setting"
 msgstr ""

@@ -4052,9 +4043,6 @@ msgstr ""
 msgid "You need to select the material type and color first."
 msgstr ""

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr ""
@@ -4063,12 +4051,6 @@ msgstr ""
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr ""

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -5999,9 +5981,18 @@ msgstr ""
 msgid "Preview"
 msgstr ""

+msgid "Device"
+msgstr ""
+
+msgid "Multi-device"
+msgstr ""
+
 msgid "Project"
 msgstr ""

+msgid "Device (Web)"
+msgstr ""
+
 msgid "Yes"
 msgstr ""

@@ -6675,22 +6666,6 @@ msgstr ""
 msgid "File '%s' was lost! Please download it again."
 msgstr ""

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -10363,12 +10338,6 @@ msgstr ""
 msgid "Clean Up"
 msgstr ""

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr ""

@@ -27234,9 +27203,6 @@ msgstr ""
 msgid "An error occurred loading %s"
 msgstr ""

-msgid "/"
-msgstr ""
-
 #, boost-format
 msgid "Load %1% to %2%"
 msgstr ""
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Ian A. Bassi <>\n"
 "Language-Team: \n"
@@ -4123,16 +4123,6 @@ msgstr "Proyectos recientes"
 msgid "Go to Plate"
 msgstr "Ir a la cama"

-msgid "Device"
-msgstr "Dispositivo"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Dispositivo (Web)"
-
-msgid "Multi-device"
-msgstr "Multi-dispositivo"
-
 msgid "AMS Materials Setting"
 msgstr "Ajustes de materiales AMS"

@@ -4183,9 +4173,6 @@ msgstr "¿Estás seguro que quieres limpiar la información de filamento?"
 msgid "You need to select the material type and color first."
 msgstr "Necesitas seleccionar el tipo y el color del material primero."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Por favor, introduzca un valor válido (K in %.1f~%.1f)"
@@ -4194,12 +4181,6 @@ msgstr "Por favor, introduzca un valor válido (K in %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Introduzca un valor válido (K en %.1f~%.1f, N en %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6238,9 +6219,19 @@ msgstr "Preparar"
 msgid "Preview"
 msgstr "Previsualización"

+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "Multi-device"
+msgstr "Multi-dispositivo"
+
 msgid "Project"
 msgstr "Proyecto"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Dispositivo (Web)"
+
 msgid "Yes"
 msgstr "Sí"

@@ -6934,22 +6925,6 @@ msgstr "El archivo .gcode .3mf no contiene datos de G-Code. Por favor, lamine co
 msgid "File '%s' was lost! Please download it again."
 msgstr "¡El archivo '%s' se perdió!\" Por favor, vuelva a descargárlo."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -10956,12 +10931,6 @@ msgstr "Cancelar timelapse e imprimir"
 msgid "Clean Up"
 msgstr "Limpiar"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Preparando el trabajo de impresión"

@@ -30509,9 +30478,6 @@ msgstr "Activar herramientas de desarrollo"
 msgid "An error occurred loading %s"
 msgstr "Se produjo un error al cargar %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -32569,6 +32535,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Se produjo un error al cargar "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-07-20 13:33+0200\n"
 "Last-Translator: Manu Goiogana <mgoiogana@gmail.com>\n"
 "Language-Team: \n"
@@ -4165,16 +4165,6 @@ msgstr "Azken proiektuak"
 msgid "Go to Plate"
 msgstr "Joan plakara"

-msgid "Device"
-msgstr "Gailua"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Gailua (Web)"
-
-msgid "Multi-device"
-msgstr "Gailu anitz"
-
 msgid "AMS Materials Setting"
 msgstr "AMS Materialen Ezarpena"

@@ -4226,9 +4216,6 @@ msgstr "Ziur zaude filamentuaren informazioa garbitu nahi duzula?"
 msgid "You need to select the material type and color first."
 msgstr "Lehenik eta behin, material-mota eta kolorea hautatu behar dituzu."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Mesedez, sartu baliozko balio bat (K in %.1f~%.1f)"
@@ -4237,12 +4224,6 @@ msgstr "Mesedez, sartu baliozko balio bat (K in %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Mesedez, sartu baliozko balio bat (K in %.1f~%.1f, N in %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6288,9 +6269,19 @@ msgstr "Prestatu"
 msgid "Preview"
 msgstr "Aurrebista"

+msgid "Device"
+msgstr "Gailua"
+
+msgid "Multi-device"
+msgstr "Gailu anitz"
+
 msgid "Project"
 msgstr "Proiektua"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Gailua (Web)"
+
 msgid "Yes"
 msgstr "Bai"

@@ -6985,22 +6976,6 @@ msgstr ".gcode.3mf fitxategiak ez du G-code daturik. Mesedez, xerratu OrcaSlicer
 msgid "File '%s' was lost! Please download it again."
 msgstr "'%s' fitxategia galdu da! Deskargatu berriro."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11062,12 +11037,6 @@ msgstr "Utzi timelapsea eta inprimatu"
 msgid "Clean Up"
 msgstr "Garbitu"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Inprimatze-lana prestatzen"

@@ -30700,9 +30669,6 @@ msgstr "Gaitu garapen-tresnak"
 msgid "An error occurred loading %s"
 msgstr "Errore bat gertatu da %s kargatzean"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -32765,6 +32731,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Errore bat gertatu da hau kargatzean: "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Guislain Cyril, Thomas Lété\n"
@@ -4195,16 +4195,6 @@ msgstr "Projets récents"
 msgid "Go to Plate"
 msgstr "Aller à la plaque"

-msgid "Device"
-msgstr "Appareil"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Appareil (Web)"
-
-msgid "Multi-device"
-msgstr "Multi-appareils"
-
 msgid "AMS Materials Setting"
 msgstr "Réglage des matériaux AMS"

@@ -4255,9 +4245,6 @@ msgstr "Voulez-vous vraiment effacer les informations du filament ?"
 msgid "You need to select the material type and color first."
 msgstr "Vous devez d'abord sélectionner le type de matériau et sa couleur."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Veuillez saisir une valeur valide (K entre %.1f~%.1f)"
@@ -4266,12 +4253,6 @@ msgstr "Veuillez saisir une valeur valide (K entre %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Veuillez saisir une valeur valide (K entre %.1f~%.1f, N entre %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6327,9 +6308,19 @@ msgstr "Préparer"
 msgid "Preview"
 msgstr "Aperçu"

+msgid "Device"
+msgstr "Appareil"
+
+msgid "Multi-device"
+msgstr "Multi-appareils"
+
 msgid "Project"
 msgstr "Projet"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Appareil (Web)"
+
 msgid "Yes"
 msgstr "Oui"

@@ -7024,22 +7015,6 @@ msgstr "Le fichier G-code .3mf ne contient pas de données G-code. Veuillez le d
 msgid "File '%s' was lost! Please download it again."
 msgstr "Le fichier « %s » a été perdu ! Veuillez le télécharger à nouveau."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11078,12 +11053,6 @@ msgstr "Annuler le timelapse et imprimer"
 msgid "Clean Up"
 msgstr "Nettoyer"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Préparation du travail d'impression"

@@ -30446,9 +30415,6 @@ msgstr "Activer les outils de développement"
 msgid "An error occurred loading %s"
 msgstr "Une erreur s’est produite lors du chargement de %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -32500,6 +32466,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Une erreur s’est produite lors du chargement de "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4302,17 +4302,6 @@ msgstr "Legutóbbi projektek"
 msgid "Go to Plate"
 msgstr "Ugrás a tálcára"

-msgid "Device"
-msgstr "Nyomtató"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Nyomtató (Web)"
-
-# AI Translated
-msgid "Multi-device"
-msgstr "Több eszköz"
-
 msgid "AMS Materials Setting"
 msgstr "AMS anyagok beállítása"

@@ -4365,9 +4354,6 @@ msgstr "Biztosan törölni szeretnéd a filament adatait?"
 msgid "You need to select the material type and color first."
 msgstr "Először ki kell választanod az anyagtípust és a színt."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Adj meg érvényes értéket (K tartomány: %.1f~%.1f)"
@@ -4376,12 +4362,6 @@ msgstr "Adj meg érvényes értéket (K tartomány: %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Adj meg érvényes értéket (K tartomány: %.1f~%.1f, N tartomány: %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6468,9 +6448,20 @@ msgstr "Előkészítés"
 msgid "Preview"
 msgstr "Előnézet"

+msgid "Device"
+msgstr "Nyomtató"
+
+# AI Translated
+msgid "Multi-device"
+msgstr "Több eszköz"
+
 msgid "Project"
 msgstr "Projekt"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Nyomtató (Web)"
+
 msgid "Yes"
 msgstr "Igen"

@@ -7176,22 +7167,6 @@ msgstr "A .gcode.3mf fájl nem tartalmaz G-code adatot. Szeleteld újra Orca Sli
 msgid "File '%s' was lost! Please download it again."
 msgstr "A(z) '%s' fájl elveszett! Kérlek, töltsd le újra."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11354,12 +11329,6 @@ msgstr "Timelapse megszakítása és nyomtatás"
 msgid "Clean Up"
 msgstr "Tisztítás"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Nyomtatási feladat előkészítése"

@@ -31428,10 +31397,6 @@ msgstr "Fejlesztői eszközök engedélyezése"
 msgid "An error occurred loading %s"
 msgstr "Hiba történt a(z) %s betöltésekor"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33494,6 +33459,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Hiba történt a betöltés során: "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -4295,16 +4295,6 @@ msgstr "Progetti recenti"
 msgid "Go to Plate"
 msgstr "Vai al piatto"

-msgid "Device"
-msgstr "Dispositivo"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Dispositivo (Web)"
-
-msgid "Multi-device"
-msgstr "Multi-dispositivo"
-
 msgid "AMS Materials Setting"
 msgstr "Impostazione materiali AMS"

@@ -4357,9 +4347,6 @@ msgstr "Sei sicuro di voler cancellare le informazioni del filamento?"
 msgid "You need to select the material type and color first."
 msgstr "Devi prima selezionare il tipo e il colore del materiale."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Si prega di immettere un valore valido (K in %.1f~%.1f)"
@@ -4368,12 +4355,6 @@ msgstr "Si prega di immettere un valore valido (K in %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Si prega di immettere un valore valido (K in %.1f~%.1f, N in %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6435,9 +6416,19 @@ msgstr "Prepara"
 msgid "Preview"
 msgstr "Anteprima"

+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "Multi-device"
+msgstr "Multi-dispositivo"
+
 msgid "Project"
 msgstr "Progetto"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Dispositivo (Web)"
+
 msgid "Yes"
 msgstr "Sì"

@@ -7141,22 +7132,6 @@ msgstr "Il file .gcode.3mf non contiene dati G-code. Elaboralo con OrcaSlicer ed
 msgid "File '%s' was lost! Please download it again."
 msgstr "Il file '%s' è stato perso! Si prega di scaricarlo di nuovo."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11314,12 +11289,6 @@ msgstr "Annulla timelapse e stampa"
 msgid "Clean Up"
 msgstr "Pulisci"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Preparazione della stampa"

@@ -31290,9 +31259,6 @@ msgstr "Abilita strumenti per sviluppatori"
 msgid "An error occurred loading %s"
 msgstr "Si è verificato un errore durante il caricamento di %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33356,6 +33322,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Si è verificato un errore durante il caricamento di "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -4301,17 +4301,6 @@ msgstr "最近のプロジェクト"
 msgid "Go to Plate"
 msgstr "プレートへ移動"

-msgid "Device"
-msgstr "デバイス"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "デバイス (Web)"
-
-# AI Translated
-msgid "Multi-device"
-msgstr "マルチデバイス"
-
 msgid "AMS Materials Setting"
 msgstr "AMS素材設定"

@@ -4360,9 +4349,6 @@ msgstr "フィラメント情報をクリアしてもよろしいですか？"
 msgid "You need to select the material type and color first."
 msgstr "まず材料タイプと色を選択してください。"

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "有効な値を入力してください（Kは%.1f～%.1f）"
@@ -4371,12 +4357,6 @@ msgstr "有効な値を入力してください（Kは%.1f～%.1f）"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "有効な値を入力してください（Kは%.1f～%.1f、Nは%.1f～%.1f）"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6453,9 +6433,20 @@ msgstr "準備"
 msgid "Preview"
 msgstr "プレビュー"

+msgid "Device"
+msgstr "デバイス"
+
+# AI Translated
+msgid "Multi-device"
+msgstr "マルチデバイス"
+
 msgid "Project"
 msgstr "プロジェクト"

+# AI Translated
+msgid "Device (Web)"
+msgstr "デバイス (Web)"
+
 msgid "Yes"
 msgstr "はい"

@@ -7156,22 +7147,6 @@ msgstr ".gcode.3mfファイルにG-codeデータが含まれていません。Or
 msgid "File '%s' was lost! Please download it again."
 msgstr "ファイル %s が見つかりませんでした、もう一度ダウンロードしてください。"

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11342,12 +11317,6 @@ msgstr "タイムラプスを中止して印刷"
 msgid "Clean Up"
 msgstr "整理する"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "造形タスクを準備"

@@ -31810,9 +31779,6 @@ msgstr "開発者ツールを有効化"
 msgid "An error occurred loading %s"
 msgstr "%s の読み込み中にエラーが発生しました"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33916,6 +33882,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "読み込み中にエラーが発生しました: "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2025-06-02 17:12+0900\n"
 "Last-Translator: crwusiz <crwusiz@gmail.com>\n"
 "Language-Team: \n"
@@ -4324,16 +4324,6 @@ msgstr "최근 프로젝트"
 msgid "Go to Plate"
 msgstr "플레이트로 이동"

-msgid "Device"
-msgstr "장치"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "장치 (웹)"
-
-msgid "Multi-device"
-msgstr "멀티 디바이스"
-
 msgid "AMS Materials Setting"
 msgstr "AMS 재료 설정"

@@ -4384,9 +4374,6 @@ msgstr "정말 필라멘트 정보를 삭제하시겠습니까?"
 msgid "You need to select the material type and color first."
 msgstr "재료 유형과 색상을 먼저 선택해야 합니다."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "유효한 값을 입력하세요 (%.1f~%.1f 사이의 K)"
@@ -4395,12 +4382,6 @@ msgstr "유효한 값을 입력하세요 (%.1f~%.1f 사이의 K)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "유효한 값을 입력하세요 (%.1f~%.1f 사이의 K, %.1f~%.1f 사이의 N)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6491,9 +6472,19 @@ msgstr "준비 하기"
 msgid "Preview"
 msgstr "미리 보기"

+msgid "Device"
+msgstr "장치"
+
+msgid "Multi-device"
+msgstr "멀티 디바이스"
+
 msgid "Project"
 msgstr "프로젝트"

+# AI Translated
+msgid "Device (Web)"
+msgstr "장치 (웹)"
+
 msgid "Yes"
 msgstr "예"

@@ -7202,22 +7193,6 @@ msgstr ".gcode.3mf 파일에는 G-code 데이터가 없습니다. OrcaSlicer에
 msgid "File '%s' was lost! Please download it again."
 msgstr "'%s' 파일이 손실되었습니다! 다시 다운로드하세요."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11484,12 +11459,6 @@ msgstr "타임랩스 취소 후 출력"
 msgid "Clean Up"
 msgstr "정리"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "출력 작업 준비 중"

@@ -31828,9 +31797,6 @@ msgstr "개발자 도구 사용"
 msgid "An error occurred loading %s"
 msgstr "%s 로드 중 오류가 발생했습니다"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33906,6 +33872,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "로드 중 오류가 발생했습니다: "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -147,7 +147,6 @@ src/slic3r/GUI/HMSPanel.cpp
 src/slic3r/GUI/MainFrame.cpp
 src/slic3r/GUI/MediaPlayCtrl.cpp
 src/slic3r/GUI/MediaFilePanel.cpp
-src/slic3r/GUI/OrcaFilesPanel.cpp
 src/slic3r/GUI/ImageGrid.cpp
 src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
 src/slic3r/GUI/Printer/PrinterFileSystem.cpp
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-07-02 14:13+0300\n"
 "Last-Translator: Gintaras Kučinskas <sharanchius@gmail.com>\n"
 "Language-Team: \n"
@@ -4291,16 +4291,6 @@ msgstr "Paskutinieji projektai"
 msgid "Go to Plate"
 msgstr "Eiti į plokštę"

-msgid "Device"
-msgstr "Įrenginys"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Įrenginys (Web)"
-
-msgid "Multi-device"
-msgstr "Kelių įrenginių valdymas (Multi-device)"
-
 msgid "AMS Materials Setting"
 msgstr "AMS medžiagų nuostatos"

@@ -4351,9 +4341,6 @@ msgstr "Ar jūs tikrai norite išvalyti gijos informaciją?"
 msgid "You need to select the material type and color first."
 msgstr "Pradžioje jums reikia pasirinkti medžiagos tipą ir spalvą."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Įveskite tinkamą reikšmę (K %.1f~%.1f)"
@@ -4362,12 +4349,6 @@ msgstr "Įveskite tinkamą reikšmę (K %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Įveskite tinkamą reikšmę (K %.1f~%.1f, N %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6454,9 +6435,19 @@ msgstr "Paruošimas"
 msgid "Preview"
 msgstr "Peržiūra"

+msgid "Device"
+msgstr "Įrenginys"
+
+msgid "Multi-device"
+msgstr "Kelių įrenginių valdymas (Multi-device)"
+
 msgid "Project"
 msgstr "Projektas"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Įrenginys (Web)"
+
 msgid "Yes"
 msgstr "Taip"

@@ -7162,22 +7153,6 @@ msgstr "Failas „.gcode.3mf“ neturi G-code duomenų. Supjaustykite jį su „
 msgid "File '%s' was lost! Please download it again."
 msgstr "Failas „%s“ nerastas! Atsisiųskite jį iš naujo."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11310,12 +11285,6 @@ msgstr "Atšaukti intervalinį fotografavimą ir spausdinti"
 msgid "Clean Up"
 msgstr "Išvalyti"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Spausdinimo užduoties rengimas"

@@ -12985,7 +12954,6 @@ msgstr ""
 msgid "Select filtered"
 msgstr ""

-# AI Translated
 msgid "Clear all"
 msgstr "Išvalyti visus"

@@ -31164,10 +31132,6 @@ msgstr "Įjungti kūrėjo įrankius"
 msgid "An error occurred loading %s"
 msgstr "Įvyko klaida įkeliant %s"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33235,6 +33199,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Įvyko klaida įkeliant "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -4660,17 +4660,6 @@ msgstr "Recente projecten"
 msgid "Go to Plate"
 msgstr "Naar printbed gaan"

-msgid "Device"
-msgstr "Apparaat"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Apparaat (Web)"
-
-# AI Translated
-msgid "Multi-device"
-msgstr "Meerdere apparaten"
-
 msgid "AMS Materials Setting"
 msgstr "AMS Materiaal instellingen"

@@ -4727,9 +4716,6 @@ msgstr "Weet u zeker dat u de filamentinformatie wilt wissen?"
 msgid "You need to select the material type and color first."
 msgstr "U moet eerst het materiaaltype en de kleur selecteren."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 # AI Translated
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
@@ -4740,12 +4726,6 @@ msgstr "Voer een geldige waarde in (K tussen %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Voer een geldige waarde in (K tussen %.1f~%.1f, N tussen %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 # AI Translated
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
@@ -6988,10 +6968,21 @@ msgstr "Voorbereiden"
 msgid "Preview"
 msgstr "Voorvertoning"

+msgid "Device"
+msgstr "Apparaat"
+
+# AI Translated
+msgid "Multi-device"
+msgstr "Meerdere apparaten"
+
 # AI Translated
 msgid "Project"
 msgstr "Project"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Apparaat (Web)"
+
 msgid "Yes"
 msgstr "Ja"

@@ -7740,22 +7731,6 @@ msgstr "Het .gcode.3mf-bestand bevat geen G-code-gegevens. Slice het met Orca Sl
 msgid "File '%s' was lost! Please download it again."
 msgstr "Bestand '%s' is verloren gegaan! Download het opnieuw."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -12197,12 +12172,6 @@ msgstr "Timelapse annuleren en printen"
 msgid "Clean Up"
 msgstr "Opruimen"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Print opdracht voorbereiden"

@@ -33354,9 +33323,6 @@ msgstr "Ontwikkelaarstools inschakelen"
 msgid "An error occurred loading %s"
 msgstr "Er is een fout opgetreden bij het laden van %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -35490,6 +35456,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Er is een fout opgetreden bij het laden van "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OrcaSlicer 2.3.0-rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Krzysztof Morga <<tlumaczeniebs@gmail.com>>\n"
 "Language-Team: \n"
@@ -4382,16 +4382,6 @@ msgstr "Ostatnie projekty"
 msgid "Go to Plate"
 msgstr "Przejdź do płyty"

-msgid "Device"
-msgstr "Urządzenie"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Urządzenie (Web)"
-
-msgid "Multi-device"
-msgstr "Wiele urządzeń"
-
 msgid "AMS Materials Setting"
 msgstr "Ustawienia filamentów AMS"

@@ -4445,9 +4435,6 @@ msgstr "Czy na pewno usunąć informacje o filamentach?"
 msgid "You need to select the material type and color first."
 msgstr "Najpierw należy wybrać rodzaj i kolor filamentu."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Proszę podać prawidłową wartość (K w zakresie %.1f~%.1f)"
@@ -4456,12 +4443,6 @@ msgstr "Proszę podać prawidłową wartość (K w zakresie %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Proszę podać prawidłową wartość (K w zakresie %.1f~%.1f, N in %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6571,9 +6552,19 @@ msgstr "Przygotowanie"
 msgid "Preview"
 msgstr "Podgląd"

+msgid "Device"
+msgstr "Urządzenie"
+
+msgid "Multi-device"
+msgstr "Wiele urządzeń"
+
 msgid "Project"
 msgstr "Projekt"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Urządzenie (Web)"
+
 msgid "Yes"
 msgstr "Tak"

@@ -7292,22 +7283,6 @@ msgstr "Plik .gcode.3mf nie zawiera danych G-code. Proszę poddać go obróbce w
 msgid "File '%s' was lost! Please download it again."
 msgstr "Plik „%s” został utracony! Proszę pobrać go ponownie."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11583,12 +11558,6 @@ msgstr "Anuluj timelapse i drukuj"
 msgid "Clean Up"
 msgstr "Wyczyść"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Przygotowywanie zadania do druku"

@@ -31809,9 +31778,6 @@ msgstr "Włącz narzędzia deweloperskie"
 msgid "An error occurred loading %s"
 msgstr "Wystąpił błąd podczas ładowania %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33854,6 +33820,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Wystąpił błąd podczas ładowania"

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-07-26 11:14-0300\n"
 "Last-Translator: Alexandre Folle de Menezes\n"
 "Language-Team: Portuguese, Brazilian\n"
@@ -4132,15 +4132,6 @@ msgstr "Projetos Recentes"
 msgid "Go to Plate"
 msgstr "Ir para Placa"

-msgid "Device"
-msgstr "Dispositivo"
-
-msgid "Device (Web)"
-msgstr "Dispositivo (Web)"
-
-msgid "Multi-device"
-msgstr "Multi-dispositivo"
-
 msgid "AMS Materials Setting"
 msgstr "Configuração de Materiais AMS"

@@ -4191,9 +4182,6 @@ msgstr "Tem certeza de que deseja limpar as informações do filamento?"
 msgid "You need to select the material type and color first."
 msgstr "Você precisa selecionar o tipo e a cor do material primeiro."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Por favor insira um valor válido (K entre %.1f~%.1f)"
@@ -4202,12 +4190,6 @@ msgstr "Por favor insira um valor válido (K entre %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Por favor insira um valor válido (K entre %.1f~%.1f, N entre %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6240,9 +6222,18 @@ msgstr "Preparar"
 msgid "Preview"
 msgstr "Pré-visualizar"

+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "Multi-device"
+msgstr "Multi-dispositivo"
+
 msgid "Project"
 msgstr "Projeto"

+msgid "Device (Web)"
+msgstr "Dispositivo (Web)"
+
 msgid "Yes"
 msgstr "Sim"

@@ -6933,22 +6924,6 @@ msgstr "O arquivo .gcode.3mf não contém dados de G-code. Por favor, fatie com
 msgid "File '%s' was lost! Please download it again."
 msgstr "O arquivo '%s' foi perdido! Por favor, baixe-o novamente."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -10898,12 +10873,6 @@ msgstr "Cancelar Timelapse e Imprimir"
 msgid "Clean Up"
 msgstr "Limpar"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Preparando trabalho de impressão"

@@ -30390,10 +30359,6 @@ msgstr "Ativar Ferramentas de Desenvolvedor"
 msgid "An error occurred loading %s"
 msgstr "Ocorreu um erro ao carregar %s"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -32449,6 +32414,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Ocorreu um erro ao carregar "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OrcaSlicer V2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-02-25 13:38+0300\n"
 "Last-Translator: Felix14_v2\n"
 "Language-Team: Felix14_v2 (ДС/ТГ: @felix14_v2, почта: aleks111001@list.ru), Andylg <andylg@yandex.ru>\n"
@@ -4267,16 +4267,6 @@ msgstr "Недавние проекты"
 msgid "Go to Plate"
 msgstr "Перейти к столу"

-msgid "Device"
-msgstr "Принтер"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Принтер (веб)"
-
-msgid "Multi-device"
-msgstr "Принтеры"
-
 msgid "AMS Materials Setting"
 msgstr "Настройка материалов AMS"

@@ -4327,9 +4317,6 @@ msgstr "Вы действительно хотите удалить информ
 msgid "You need to select the material type and color first."
 msgstr "Сначала нужно выбрать тип материала и цвет."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Пожалуйста, введите допустимое значение (K в диапазоне %.1f~%.1f)"
@@ -4338,12 +4325,6 @@ msgstr "Пожалуйста, введите допустимое значени
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Пожалуйста, введите допустимое значение (K в диапазоне %.1f~%.1f, N в диапазоне %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 # Дичь какая-то бамбуковская с терминами, требуется проверка.
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
@@ -6484,9 +6465,19 @@ msgstr "Подготовка"
 msgid "Preview"
 msgstr "Просмотр нарезки"

+msgid "Device"
+msgstr "Принтер"
+
+msgid "Multi-device"
+msgstr "Принтеры"
+
 msgid "Project"
 msgstr "Проект"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Принтер (веб)"
+
 msgid "Yes"
 msgstr "Да"

@@ -7199,22 +7190,6 @@ msgstr "Файл .gcode.3mf не содержит данных G-code. Испо
 msgid "File '%s' was lost! Please download it again."
 msgstr "Файл '%s' потерян! Пожалуйста, загрузите его снова."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11323,12 +11298,6 @@ msgstr "Отключить таймлапс и продолжить"
 msgid "Clean Up"
 msgstr "Очистить"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Подготовка задания на печать"

@@ -12999,7 +12968,6 @@ msgstr ""
 msgid "Select filtered"
 msgstr ""

-# AI Translated
 msgid "Clear all"
 msgstr "Очистить"

@@ -31658,9 +31626,6 @@ msgstr "Включить инструменты разработчика"
 msgid "An error occurred loading %s"
 msgstr "Ошибка при загрузке %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33728,6 +33693,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Ошибка при загрузке "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4728,17 +4728,6 @@ msgstr "Senaste projekt"
 msgid "Go to Plate"
 msgstr "Gå till platta"

-msgid "Device"
-msgstr "Enhet"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Enhet (Webb)"
-
-# AI Translated
-msgid "Multi-device"
-msgstr "Flera enheter"
-
 msgid "AMS Materials Setting"
 msgstr "AMS Material Inställning"

@@ -4792,9 +4781,6 @@ msgstr "Är du säker på att du vill rensa filament informationen?"
 msgid "You need to select the material type and color first."
 msgstr "Du måste först välja materialtyp och färg."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 # AI Translated
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
@@ -4805,12 +4791,6 @@ msgstr "Ange ett giltigt värde (K mellan %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Ange ett giltigt värde (K mellan %.1f~%.1f, N mellan %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 # AI Translated
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
@@ -7085,9 +7065,20 @@ msgstr "Förbered"
 msgid "Preview"
 msgstr "Förhandsvisning"

+msgid "Device"
+msgstr "Enhet"
+
+# AI Translated
+msgid "Multi-device"
+msgstr "Flera enheter"
+
 msgid "Project"
 msgstr "Projekt"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Enhet (Webb)"
+
 msgid "Yes"
 msgstr "Ja"

@@ -7834,22 +7825,6 @@ msgstr "Filen .gcode.3mf innehåller inga G-code-data. Bered den med Orca Slicer
 msgid "File '%s' was lost! Please download it again."
 msgstr "Filen '%s' förlorades! Ladda ner den igen."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 # AI Translated
 #, c-format, boost-format
 msgid ""
@@ -12345,12 +12320,6 @@ msgstr "Avbryt timelapse och skriv ut"
 msgid "Clean Up"
 msgstr "Rensa"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Förbereder utskriftsjobb"

@@ -33688,9 +33657,6 @@ msgstr "Aktivera utvecklarverktyg"
 msgid "An error occurred loading %s"
 msgstr "Ett fel uppstod vid inläsning av %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -35844,6 +35810,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Ett fel uppstod vid inläsning av "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-06-19 13:40+0700\n"
 "Last-Translator: Icezaza\n"
 "Language-Team: Thai\n"
@@ -4279,16 +4279,6 @@ msgstr "โปรเจกต์ล่าสุด"
 msgid "Go to Plate"
 msgstr "ไปที่ฐานพิมพ์"

-msgid "Device"
-msgstr "อุปกรณ์"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "อุปกรณ์ (เว็บ)"
-
-msgid "Multi-device"
-msgstr "หลายอุปกรณ์"
-
 msgid "AMS Materials Setting"
 msgstr "การตั้งค่าวัสดุ AMS"

@@ -4339,9 +4329,6 @@ msgstr "คุณแน่ใจหรือไม่ว่าต้องกา
 msgid "You need to select the material type and color first."
 msgstr "คุณต้องเลือกประเภทวัสดุและสีก่อน"

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "โปรดป้อนค่าที่ถูกต้อง (K อยู่ในช่วง %.1f~%.1f)"
@@ -4350,12 +4337,6 @@ msgstr "โปรดป้อนค่าที่ถูกต้อง (K อ
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "โปรดป้อนค่าที่ถูกต้อง (K ใน %.1f~%.1f, N ใน %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6418,9 +6399,19 @@ msgstr "เตรียมพิมพ์"
 msgid "Preview"
 msgstr "พรีวิว"

+msgid "Device"
+msgstr "อุปกรณ์"
+
+msgid "Multi-device"
+msgstr "หลายอุปกรณ์"
+
 msgid "Project"
 msgstr "โปรเจกต์"

+# AI Translated
+msgid "Device (Web)"
+msgstr "อุปกรณ์ (เว็บ)"
+
 msgid "Yes"
 msgstr "ใช่"

@@ -7115,22 +7106,6 @@ msgstr "ไฟล์ .gcode.3mf ไม่มีข้อมูล G-code โป
 msgid "File '%s' was lost! Please download it again."
 msgstr "ไฟล์ '%s' สูญหาย! กรุณาดาวน์โหลดอีกครั้ง."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11240,12 +11215,6 @@ msgstr "ยกเลิกไทม์แลปส์และพิมพ์"
 msgid "Clean Up"
 msgstr "ล้าง"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "กำลังเตรียมงานพิมพ์"

@@ -31045,10 +31014,6 @@ msgstr "เปิดใช้งานเครื่องมือนักพ
 msgid "An error occurred loading %s"
 msgstr "เกิดข้อผิดพลาดในการโหลด %s"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33110,6 +33075,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "เกิดข้อผิดพลาดในการโหลด "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-08-21 23:18+0300\n"
 "Last-Translator: GlauTech\n"
 "Language-Team: \n"
@@ -4331,16 +4331,6 @@ msgstr "Son Projeler"
 msgid "Go to Plate"
 msgstr "Plakaya Git"

-msgid "Device"
-msgstr "Cihaz"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Cihaz (Web)"
-
-msgid "Multi-device"
-msgstr "Çoklu cihaz"
-
 msgid "AMS Materials Setting"
 msgstr "AMS Malzeme Ayarı"

@@ -4391,9 +4381,6 @@ msgstr "Filament bilgisini temizlemek istediğinizden emin misiniz?"
 msgid "You need to select the material type and color first."
 msgstr "Önce malzeme türünü ve rengini seçmeniz gerekir."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Lütfen geçerli bir değer girin (K %.1f~%.1f içinde)"
@@ -4402,12 +4389,6 @@ msgstr "Lütfen geçerli bir değer girin (K %.1f~%.1f içinde)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Lütfen geçerli bir değer girin (K %.1f~%.1f içinde, N %.1f~%.1f içinde)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6484,9 +6465,19 @@ msgstr "Hazırlık"
 msgid "Preview"
 msgstr "Ön İzleme"

+msgid "Device"
+msgstr "Cihaz"
+
+msgid "Multi-device"
+msgstr "Çoklu cihaz"
+
 msgid "Project"
 msgstr "Proje"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Cihaz (Web)"
+
 msgid "Yes"
 msgstr "Evet"

@@ -7188,22 +7179,6 @@ msgstr ".gcode.3mf dosyası hiçbir G-code verisi içermiyor. Lütfen dosyayı B
 msgid "File '%s' was lost! Please download it again."
 msgstr "'%s' dosyası kayboldu! Lütfen tekrar indirin."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11372,12 +11347,6 @@ msgstr "Timelapse'i İptal Et ve Yazdır"
 msgid "Clean Up"
 msgstr "Temizle"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Yazdırma için hazırlanıyor"

@@ -31488,10 +31457,6 @@ msgstr "Geliştirici Araçlarını Etkinleştir"
 msgid "An error occurred loading %s"
 msgstr "%s yüklenirken bir hata oluştu"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33558,6 +33523,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Yüklenirken bir hata oluştu: "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: orcaslicerua\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-07-17 16:25+0300\n"
 "Last-Translator: Andrij Mizyk <andm1zyk@proton.me>\n"
 "Language-Team: Ukrainian\n"
@@ -4245,16 +4245,6 @@ msgstr "Останні проєкти"
 msgid "Go to Plate"
 msgstr "Перейти до пластини"

-msgid "Device"
-msgstr "Пристрій"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Пристрій (Веб)"
-
-msgid "Multi-device"
-msgstr "Багато пристроїв"
-
 msgid "AMS Materials Setting"
 msgstr "Налаштування матеріалів AMS"

@@ -4305,9 +4295,6 @@ msgstr "Ви впевнені, що хочете видалити інформа
 msgid "You need to select the material type and color first."
 msgstr "Спочатку потрібно вибрати тип матеріалу та колір."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Будь ласка введіть коректне значення (K в %.1f~%.1f)"
@@ -4316,12 +4303,6 @@ msgstr "Будь ласка введіть коректне значення (K
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Будь ласка введіть коректне значення (K в %.1f~%.1f, N в %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 # AI Translated
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
@@ -6448,9 +6429,19 @@ msgstr "Підготовка"
 msgid "Preview"
 msgstr "Перегляд"

+msgid "Device"
+msgstr "Пристрій"
+
+msgid "Multi-device"
+msgstr "Багато пристроїв"
+
 msgid "Project"
 msgstr "Проєкт"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Пристрій (Веб)"
+
 msgid "Yes"
 msgstr "Так"

@@ -7157,22 +7148,6 @@ msgstr "Файл .gcode.3mf не містить даних G-code. Будь ла
 msgid "File '%s' was lost! Please download it again."
 msgstr "Файл '%s' втрачений! Завантажте його знову."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11389,12 +11364,6 @@ msgstr "Скасувати таймлапс і друкувати"
 msgid "Clean Up"
 msgstr "Очистити"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Підготовка завдання для друку"

@@ -31655,9 +31624,6 @@ msgstr "Увімкнути інструменти розробника"
 msgid "An error occurred loading %s"
 msgstr "Помилка під час завантаження %s"

-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33752,6 +33718,9 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Помилка під час завантаження "

+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2025-10-02 17:43+0700\n"
 "Last-Translator: \n"
 "Language-Team: hainguyen.ts13@gmail.com\n"
@@ -4503,16 +4503,6 @@ msgstr "Dự án gần đây"
 msgid "Go to Plate"
 msgstr "Đi tới plate"

-msgid "Device"
-msgstr "Thiết bị"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "Thiết bị (Web)"
-
-msgid "Multi-device"
-msgstr "Nhiều thiết bị"
-
 msgid "AMS Materials Setting"
 msgstr "Cài đặt vật liệu AMS"

@@ -4565,9 +4555,6 @@ msgstr "Bạn có chắc muốn xóa thông tin filament?"
 msgid "You need to select the material type and color first."
 msgstr "Bạn cần chọn loại vật liệu và màu trước."

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "Vui lòng nhập giá trị hợp lệ (K trong %.1f~%.1f)"
@@ -4576,12 +4563,6 @@ msgstr "Vui lòng nhập giá trị hợp lệ (K trong %.1f~%.1f)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "Vui lòng nhập giá trị hợp lệ (K trong %.1f~%.1f, N trong %.1f~%.1f)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 # AI Translated
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
@@ -6808,9 +6789,19 @@ msgstr "Chuẩn bị"
 msgid "Preview"
 msgstr "Xem trước"

+msgid "Device"
+msgstr "Thiết bị"
+
+msgid "Multi-device"
+msgstr "Nhiều thiết bị"
+
 msgid "Project"
 msgstr "Dự án"

+# AI Translated
+msgid "Device (Web)"
+msgstr "Thiết bị (Web)"
+
 msgid "Yes"
 msgstr "Có"

@@ -7522,22 +7513,6 @@ msgstr "File .gcode.3mf không chứa dữ liệu G-code. Vui lòng slice với
 msgid "File '%s' was lost! Please download it again."
 msgstr "File '%s' đã bị mất! Vui lòng tải lại."

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11912,12 +11887,6 @@ msgstr "Hủy timelapse & In"
 msgid "Clean Up"
 msgstr "Dọn dẹp"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "Đang chuẩn bị công việc in"

@@ -32326,10 +32295,6 @@ msgstr "Bật công cụ nhà phát triển"
 msgid "An error occurred loading %s"
 msgstr "Đã xảy ra lỗi khi tải %s"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -34433,6 +34398,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "Đã xảy ra lỗi khi tải "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Slic3rPE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2026-06-11 12:37-0300\n"
 "Last-Translator: Handle <mail@bysb.net>\n"
 "Language-Team: \n"
@@ -4162,16 +4162,6 @@ msgstr "最近的项目"
 msgid "Go to Plate"
 msgstr "转到盘"

-msgid "Device"
-msgstr "设备"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "设备（网页）"
-
-msgid "Multi-device"
-msgstr "多设备"
-
 msgid "AMS Materials Setting"
 msgstr "AMS 材料设置"

@@ -4220,9 +4210,6 @@ msgstr "您确定要清除耗材丝信息吗？"
 msgid "You need to select the material type and color first."
 msgstr "您需要先选择材料类型和颜色。"

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "请输入有效的数值（K的范围为%.1f~%.1f）"
@@ -4231,12 +4218,6 @@ msgstr "请输入有效的数值（K的范围为%.1f~%.1f）"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "请输入有效的数值（K的范围为%.1f~%.1f，N的范围为%.1f~%.1f）"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6317,9 +6298,19 @@ msgstr "准备"
 msgid "Preview"
 msgstr "预览"

+msgid "Device"
+msgstr "设备"
+
+msgid "Multi-device"
+msgstr "多设备"
+
 msgid "Project"
 msgstr "项目"

+# AI Translated
+msgid "Device (Web)"
+msgstr "设备（网页）"
+
 msgid "Yes"
 msgstr "是"

@@ -7015,22 +7006,6 @@ msgstr ".gcode.3mf文件中不包含G-code数据。请使用Orca Slicer进行切
 msgid "File '%s' was lost! Please download it again."
 msgstr "文件%s丢失，请重新下载。"

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11140,12 +11115,6 @@ msgstr "取消延时摄影，继续打印"
 msgid "Clean Up"
 msgstr "清理"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "正在准备打印任务"

@@ -12807,7 +12776,6 @@ msgstr "未勾选"
 msgid "Select filtered"
 msgstr "选择筛选项"

-# AI Translated
 msgid "Clear all"
 msgstr "清空"

@@ -31179,10 +31147,6 @@ msgstr "启用开发者工具"
 msgid "An error occurred loading %s"
 msgstr "加载 %s 时出错"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33250,6 +33214,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "加载时出错： "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-12 19:00+0800\n"
+"POT-Creation-Date: 2026-10-11 16:21+0800\n"
 "PO-Revision-Date: 2025-11-28 13:48-0600\n"
 "Last-Translator: tntchn <15895303+tntchn@users.noreply.github.com>\n"
 "Language-Team: \n"
@@ -4237,16 +4237,6 @@ msgstr "最近的專案"
 msgid "Go to Plate"
 msgstr "前往列印板"

-msgid "Device"
-msgstr "裝置"
-
-# AI Translated
-msgid "Device (Web)"
-msgstr "裝置（網頁）"
-
-msgid "Multi-device"
-msgstr "多臺裝置"
-
 msgid "AMS Materials Setting"
 msgstr "AMS 線材設定"

@@ -4298,9 +4288,6 @@ msgstr "您確認要清除線材資訊嗎？"
 msgid "You need to select the material type and color first."
 msgstr "您需要先選擇線材類型和顏色。"

-msgid "The minimum temperature cannot be greater than the maximum temperature."
-msgstr ""
-
 #, c-format, boost-format
 msgid "Please input a valid value (K in %.1f~%.1f)"
 msgstr "請輸入有效的數值 (K於 %.1f~%.1f 之間)"
@@ -4309,12 +4296,6 @@ msgstr "請輸入有效的數值 (K於 %.1f~%.1f 之間)"
 msgid "Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"
 msgstr "請輸入有效的數值 (K於 %.1f~%.1f 之間，N於 %.1f~%.1f 之間)"

-msgid "Favorite filaments"
-msgstr ""
-
-msgid "All filaments"
-msgstr ""
-
 msgid ""
 "The nozzle flow is not set. Please set the nozzle flow rate before editing the filament.\n"
 "'Device -> Print parts'"
@@ -6400,9 +6381,19 @@ msgstr "準備"
 msgid "Preview"
 msgstr "預覽"

+msgid "Device"
+msgstr "裝置"
+
+msgid "Multi-device"
+msgstr "多臺裝置"
+
 msgid "Project"
 msgstr "專案"

+# AI Translated
+msgid "Device (Web)"
+msgstr "裝置（網頁）"
+
 msgid "Yes"
 msgstr "是"

@@ -7097,22 +7088,6 @@ msgstr ".gcode.3mf 檔案不包含 G-code 資料。請使用 OrcaSlicer 切片
 msgid "File '%s' was lost! Please download it again."
 msgstr "檔案 %s 遺失，請重新下載。"

-msgid "gcodes"
-msgstr ""
-
-msgid "Failed to delete the file from printer."
-msgstr ""
-
-#, c-format, boost-format
-msgid "Do you want to print the file '%s' from printer?"
-msgstr ""
-
-msgid "Print file"
-msgstr ""
-
-msgid "Failed to start the print job."
-msgstr ""
-
 #, c-format, boost-format
 msgid ""
 "File: %s\n"
@@ -11228,12 +11203,6 @@ msgstr "取消縮時攝影並列印"
 msgid "Clean Up"
 msgstr "清理"

-msgid "AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."
-msgstr ""
-
-msgid "A filament used by this print has no AMS mapping. Assign it before printing."
-msgstr ""
-
 msgid "Preparing print job"
 msgstr "正在準備列印作業"

@@ -12883,7 +12852,6 @@ msgstr ""
 msgid "Select filtered"
 msgstr ""

-# AI Translated
 msgid "Clear all"
 msgstr "清空"

@@ -30969,10 +30937,6 @@ msgstr "啟用開發者工具"
 msgid "An error occurred loading %s"
 msgstr "載入 %s 時發生錯誤"

-# AI Translated
-msgid "/"
-msgstr "/"
-
 # AI Translated
 #, boost-format
 msgid "Load %1% to %2%"
@@ -33050,6 +33014,10 @@ msgstr ""
 #~ msgid "An error occurred loading "
 #~ msgstr "載入時發生錯誤： "

+# AI Translated
+#~ msgid "/"
+#~ msgstr "/"
+
 # AI Translated
 #, c-format, boost-format
 #~ msgid "Load %s to "
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M2.5,2.5h11v11h-11z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M8,2.5v11M2.5,8h11" style="fill:none;stroke:#949494;stroke-dasharray:1.5,1.5"/><path d="M4.5,11.5l3.5-6l3.5,6z" style="fill:#009688"/></svg>
@@ -126,13 +126,6 @@
  </array>
  <key>LSMinimumSystemVersion</key>
  <string>10.10</string>
-  <key>NSLocalNetworkUsageDescription</key>
-  <string>OrcaSlicer uses your local network to discover and connect to printers.</string>
-  <key>NSBonjourServices</key>
-  <array>
-    <string>_octoprint._tcp</string>
-    <string>_http._tcp</string>
-  </array>
  <key>NSPrincipalClass</key>
  <string>NSApplication</string>
  <key>NSHighResolutionCapable</key>
@@ -22,6 +22,7 @@
 #include "libslic3r/BrimEarsPoint.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/CustomGCode.hpp"
+#include "libslic3r/TextureDisplacement.hpp"
 #include "libslic3r_version.h"

 #include "bbs_3mf.hpp"
@@ -354,6 +355,13 @@ static constexpr const char* CUSTOM_SUPPORTS_ATTR = "paint_supports";
 static constexpr const char* CUSTOM_FUZZY_SKIN_ATTR  = "paint_fuzzy_skin";
 static constexpr const char* CUSTOM_SEAM_ATTR = "paint_seam";
 static constexpr const char* MMU_SEGMENTATION_ATTR = "paint_color";
+// Texture displacement. One paint mask per layer slot, mirroring paint_color; the layer stack itself is
+// a JSON file in the archive, named by the volume metadata key below (see add_texture_displacement()).
+static constexpr const char* TEXTURE_DISPLACEMENT_ATTRS[Slic3r::TEXTURE_DISPLACEMENT_MAX_LAYERS] = {
+    "paint_texture_0", "paint_texture_1", "paint_texture_2", "paint_texture_3",
+    "paint_texture_4", "paint_texture_5", "paint_texture_6", "paint_texture_7" };
+static constexpr const char* TEXTURE_DISPLACEMENT_KEY = "texture_displacement";
+static constexpr const char* TEXTURE_DISPLACEMENT_DIR = "Metadata/texture_displacement/";
 // BBS
 static constexpr const char* FACE_PROPERTY_ATTR = "face_property";

@@ -847,6 +855,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            std::vector<std::string> custom_seam;
            std::vector<std::string> mmu_segmentation;
            std::vector<std::string> fuzzy_skin;
+            // One per texture displacement layer slot, indexed like `triangles` but stored only as far as the
+            // slot's last painted triangle: empty when the slot has no paint, which is nearly every file.
+            std::vector<std::string> texture_displacement[TEXTURE_DISPLACEMENT_MAX_LAYERS];
            // BBS
            std::vector<std::string> face_properties;

@@ -867,6 +878,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                custom_seam.clear();
                mmu_segmentation.clear();
                fuzzy_skin.clear();
+                for (std::vector<std::string> &slot : texture_displacement)
+                    slot.clear();
            }
        };

@@ -1200,6 +1213,11 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        /*IdToSlaSupportPointsMap m_sla_support_points;
        IdToSlaDrainHolesMap    m_sla_drain_holes;*/
        PathToEmbossShapeFileMap m_path_to_emboss_shape_files;
+        // Texture displacement: every file under Metadata/texture_displacement/, by archive path. Volumes
+        // are built only after the whole archive has been walked, so by the time a volume names its JSON
+        // every file it could refer to is already in here, whatever order the archive happened to be in.
+        std::map<std::string, std::string> m_texture_displacement_files;
+        void _apply_texture_displacement(ModelVolume &volume, const std::string &json_path);
        std::string m_curr_metadata_name;
        std::string m_curr_characters;
        std::string m_name;
@@ -2073,6 +2091,13 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                else if (_is_svg_shape_file(name)) {
                    _extract_embossed_svg_shape_file(name, archive, stat);
                }
+                else if (boost::algorithm::istarts_with(name, TEXTURE_DISPLACEMENT_DIR)) {
+                    std::string contents(stat.m_uncomp_size, '\0');
+                    if (mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, contents.data(), stat.m_uncomp_size, 0))
+                        m_texture_displacement_files.emplace(name, std::move(contents));
+                    else
+                        add_error("Error while reading texture displacement data");
+                }
                else if (!dont_load_config && boost::algorithm::iequals(name, SLICE_INFO_CONFIG_FILE)) {
                    m_parsing_slice_info = true;
                    //extract slice info from archive
@@ -3310,6 +3335,45 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        }
    }*/

+    // Restores one volume's texture displacement stack from the JSON it named. Called while the volume is
+    // being built, which is after the whole archive has been walked - so every file it can refer to is
+    // already extracted, and no deferral is needed.
+    //
+    // A missing or malformed JSON leaves the volume with no layers but keeps the paint mask it already
+    // loaded, which is the same state as a project saved by a build without the feature: recoverable by
+    // picking the texture again rather than a hard failure.
+    void _BBS_3MF_Importer::_apply_texture_displacement(ModelVolume &volume, const std::string &json_path)
+    {
+        const auto json = m_texture_displacement_files.find(json_path);
+        if (json == m_texture_displacement_files.end()) {
+            add_error("Missing texture displacement data: " + json_path);
+            return;
+        }
+        std::vector<TextureDisplacementLayer> layers;
+        TextureDisplacementOptions            options;
+        if (!texture_displacement_layers_from_json(json->second, layers, options)) {
+            add_error("Malformed texture displacement data: " + json_path);
+            return;
+        }
+        // The archive is the only source of a layer's pixels. `path` comes from the project file, so loading
+        // the project must never read the file it names: that would let whoever made the project pick any
+        // local (or, on Windows, network) file to read, and the next save would embed it in the archive.
+        // `path` stays a label of where the texture came from; a layer the archive carries no image for
+        // loads without one, its settings intact, until the user picks a texture again.
+        for (TextureDisplacementLayer &layer : layers) {
+            if (layer.path_in_3mf.empty())
+                continue;
+            const auto image = m_texture_displacement_files.find(layer.path_in_3mf);
+            if (image == m_texture_displacement_files.end()) {
+                add_error("Missing texture displacement image: " + layer.path_in_3mf);
+                continue;
+            }
+            layer.image_data = std::make_shared<std::vector<unsigned char>>(image->second.begin(), image->second.end());
+        }
+        volume.texture_displacement_layers  = std::move(layers);
+        volume.texture_displacement_options = options;
+    }
+
    void _BBS_3MF_Importer::_extract_embossed_svg_shape_file(const std::string &filename, mz_zip_archive &archive, const mz_zip_archive_file_stat &stat){
        assert(m_path_to_emboss_shape_files.find(filename) == m_path_to_emboss_shape_files.end());
        auto file = std::make_unique<std::string>(stat.m_uncomp_size, '\0');
@@ -3966,6 +4030,12 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            m_curr_object->geometry.custom_seam.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SEAM_ATTR));
            m_curr_object->geometry.mmu_segmentation.push_back(bbs_get_attribute_value_string(attributes, num_attributes, MMU_SEGMENTATION_ATTR));
            m_curr_object->geometry.fuzzy_skin.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_FUZZY_SKIN_ATTR));
+            for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot)
+                if (const char *paint = bbs_get_attribute_value_charptr(attributes, num_attributes, TEXTURE_DISPLACEMENT_ATTRS[slot])) {
+                    std::vector<std::string> &mask = m_curr_object->geometry.texture_displacement[slot];
+                    mask.resize(m_curr_object->geometry.triangles.size());
+                    mask.back() = paint;
+                }
            // BBS
            m_curr_object->geometry.face_properties.push_back(bbs_get_attribute_value_string(attributes, num_attributes, FACE_PROPERTY_ATTR));
        }
@@ -5317,6 +5387,18 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                volume->mmu_segmentation_facets.touch();
                volume->fuzzy_skin_facets.shrink_to_fit();
                volume->fuzzy_skin_facets.touch();
+                for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot) {
+                    const std::vector<std::string> &mask = sub_object->geometry.texture_displacement[slot];
+                    if (mask.empty())
+                        continue; // no triangle painted on this slot
+                    FacetsAnnotation &facets = volume->texture_displacement_facet(slot);
+                    facets.reserve(triangles_count);
+                    for (size_t i = 0; i < triangles_count && i < mask.size(); ++i)
+                        if (!mask[i].empty())
+                            facets.set_triangle_from_string(i, mask[i]);
+                    facets.shrink_to_fit();
+                    facets.touch();
+                }
            }

            volume->set_type(volume_data->part_type);
@@ -5332,6 +5414,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            for (const Metadata& metadata : volume_data->metadata) {
                if (metadata.key == NAME_KEY)
                    volume->name = metadata.value;
+                else if (metadata.key == TEXTURE_DISPLACEMENT_KEY)
+                    _apply_texture_displacement(*volume, metadata.value);
                //else if ((metadata.key == MODIFIER_KEY) && (metadata.value == "1"))
 				//	volume->set_type(ModelVolumeType::PARAMETER_MODIFIER);
 				//for old format
@@ -5496,12 +5580,28 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            volume->seam_facets.shrink_to_fit();
            volume->mmu_segmentation_facets.shrink_to_fit();

+            for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot) {
+                const std::vector<std::string> &mask = geometry.texture_displacement[slot];
+                if (mask.empty())
+                    continue; // written by a build without the feature
+                FacetsAnnotation &facets = volume->texture_displacement_facet(slot);
+                facets.reserve(triangles_count);
+                for (size_t i = 0; i < triangles_count; ++i) {
+                    const size_t index = volume_data.first_triangle_id + i;
+                    if (index < mask.size() && !mask[index].empty())
+                        facets.set_triangle_from_string(i, mask[index]);
+                }
+                facets.shrink_to_fit();
+                facets.touch();
+            }
            volume->set_type(volume_data.part_type);

            // apply the remaining volume's metadata
            for (const Metadata& metadata : volume_data.metadata) {
                if (metadata.key == NAME_KEY)
                    volume->name = metadata.value;
+                else if (metadata.key == TEXTURE_DISPLACEMENT_KEY)
+                    _apply_texture_displacement(*volume, metadata.value);
                //else if ((metadata.key == MODIFIER_KEY) && (metadata.value == "1"))
 				//	volume->set_type(ModelVolumeType::PARAMETER_MODIFIER);
 				//for old format
@@ -5805,6 +5905,12 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            current_object->geometry.custom_seam.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SEAM_ATTR));
            current_object->geometry.mmu_segmentation.push_back(bbs_get_attribute_value_string(attributes, num_attributes, MMU_SEGMENTATION_ATTR));
            current_object->geometry.fuzzy_skin.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_FUZZY_SKIN_ATTR));
+            for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot)
+                if (const char *paint = bbs_get_attribute_value_charptr(attributes, num_attributes, TEXTURE_DISPLACEMENT_ATTRS[slot])) {
+                    std::vector<std::string> &mask = current_object->geometry.texture_displacement[slot];
+                    mask.resize(current_object->geometry.triangles.size());
+                    mask.back() = paint;
+                }
            // BBS
            current_object->geometry.face_properties.push_back(bbs_get_attribute_value_string(attributes, num_attributes, FACE_PROPERTY_ATTR));
        }
@@ -6808,6 +6914,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        stream << " <Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>\n";
        stream << " <Default Extension=\"model\" ContentType=\"application/vnd.ms-package.3dmanufacturing-3dmodel+xml\"/>\n";
        stream << " <Default Extension=\"png\" ContentType=\"image/png\"/>\n";
+        stream << " <Default Extension=\"jpg\" ContentType=\"image/jpeg\"/>\n";
+        stream << " <Default Extension=\"jpeg\" ContentType=\"image/jpeg\"/>\n";
+        stream << " <Default Extension=\"json\" ContentType=\"application/json\"/>\n";
        stream << " <Default Extension=\"gcode\" ContentType=\"text/x.gcode\"/>\n";
        stream << "</Types>";

@@ -7232,10 +7341,14 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                            if (iter != m_shared_meshes.end())
                            {
                                const ModelVolume* shared_volume = iter->second.second;
+                                bool same_texture_paint = true;
+                                for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS) && same_texture_paint; ++slot)
+                                    same_texture_paint = shared_volume->texture_displacement_facet(slot).equals(volume->texture_displacement_facet(slot));
                                if ((shared_volume->supported_facets.equals(volume->supported_facets))
                                    && (shared_volume->seam_facets.equals(volume->seam_facets))
                                    && (shared_volume->mmu_segmentation_facets.equals(volume->mmu_segmentation_facets))
-                                    && (shared_volume->fuzzy_skin_facets.equals(volume->fuzzy_skin_facets)))
+                                    && (shared_volume->fuzzy_skin_facets.equals(volume->fuzzy_skin_facets))
+                                    && same_texture_paint)
                                {
                                    auto data = iter->second.first;
                                    const_cast<_BBS_3MF_Exporter *>(this)->m_volume_paths.insert({volume, {data->sub_path, data->volumes_objectID.find(iter->second.second)->second}});
@@ -7651,6 +7764,20 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                    output_buffer += "\"";
                }

+                // One attribute per texture displacement layer slot. Older readers ignore attributes they do
+                // not know, so a project written here still opens in a build without the feature - it just
+                // loses the paint, which is also all it could have done with it.
+                for (int slot = 0; slot < TEXTURE_DISPLACEMENT_MAX_LAYERS; ++slot) {
+                    const std::string texture_paint = volume->texture_displacement_facet(slot).get_triangle_as_string(i);
+                    if (texture_paint.empty())
+                        continue;
+                    output_buffer += " ";
+                    output_buffer += TEXTURE_DISPLACEMENT_ATTRS[slot];
+                    output_buffer += "=\"";
+                    output_buffer += texture_paint;
+                    output_buffer += "\"";
+                }
+
                // BBS
                if (i < its.properties.size()) {
                    std::string prop_str = its.properties[i].to_string();
@@ -8100,7 +8227,42 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        return file_path;
    }

-    bool _BBS_3MF_Exporter::_add_model_config_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, const ObjectToObjectDataMap &objects_data, const DynamicPrintConfig& config, int export_plate_idx, bool save_gcode, bool use_loaded_id)
+    // Writes a volume's texture displacement stack into the archive and points the volume's metadata at it.
+// The layer settings go in as JSON and each layer's texture as the image file it was loaded from, both
+// referenced by path - the same split EmbossShape makes for its SVG. The image deliberately stays out of
+// the XML: it is binary and routinely megabytes, and base64 in an attribute would bloat the one file
+// every reader has to parse just to list the objects.
+static void add_texture_displacement(std::stringstream &stream, const ModelVolume &volume, mz_zip_archive &archive,
+                                     const std::string &id)
+{
+    if (volume.texture_displacement_layers.empty())
+        return;
+
+    // A copy, because path_in_3mf is only meaningful inside the archive being written and the volume
+    // being exported is const (and may be saved again, elsewhere, with different paths).
+    std::vector<TextureDisplacementLayer> layers = volume.texture_displacement_layers;
+    for (TextureDisplacementLayer &layer : layers) {
+        layer.path_in_3mf.clear();
+        if (!layer.image_data || layer.image_data->empty())
+            continue;
+        // Always .png: the importer converts whatever the user picked (jpg, bmp, ...) to an 8-bit
+        // greyscale PNG, so image_data is PNG whatever layer.path happens to be named.
+        const std::string path = std::string(TEXTURE_DISPLACEMENT_DIR) + id + "_" + std::to_string(layer.slot) + ".png";
+        // No deflate: a PNG is already compressed, so a second pass only costs time.
+        if (mz_zip_writer_add_mem(&archive, path.c_str(), layer.image_data->data(), layer.image_data->size(),
+                                  MZ_NO_COMPRESSION))
+            layer.path_in_3mf = path;
+    }
+
+    const std::string json      = texture_displacement_layers_to_json(layers, volume.texture_displacement_options);
+    const std::string json_path = std::string(TEXTURE_DISPLACEMENT_DIR) + id + ".json";
+    if (!mz_zip_writer_add_mem(&archive, json_path.c_str(), json.data(), json.size(), MZ_DEFAULT_COMPRESSION))
+        return;
+    stream << "      <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << TEXTURE_DISPLACEMENT_KEY << "\" "
+           << VALUE_ATTR << "=\"" << xml_escape(json_path) << "\"/>\n";
+}
+
+bool _BBS_3MF_Exporter::_add_model_config_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, const ObjectToObjectDataMap &objects_data, const DynamicPrintConfig& config, int export_plate_idx, bool save_gcode, bool use_loaded_id)
    {
        std::stringstream stream;
        // Store mesh transformation in full precision, as the volumes are stored transformed and they need to be transformed back
@@ -8211,6 +8373,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                            if (const std::optional<EmbossShape> &es = volume->emboss_shape; es.has_value()) {
                                to_xml(stream, *es, *volume, archive, m_fullpath_sources);
                            }
+
+                            add_texture_displacement(stream, *volume, archive, std::to_string(volume->id().id));
                    
                            if (const std::optional<TextConfiguration> &tc = volume->text_configuration;
                                tc.has_value())
@@ -1,349 +0,0 @@
-#include "JumpPointSearch.hpp"
-#include "BoundingBox.hpp"
-#include "ExPolygon.hpp"
-#include "Point.hpp"
-#include "libslic3r/AStar.hpp"
-#include "libslic3r/KDTreeIndirect.hpp"
-#include "libslic3r/Polygon.hpp"
-#include "libslic3r/Polyline.hpp"
-#include "libslic3r/libslic3r.h"
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <iterator>
-#include <limits>
-#include <optional>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include <oneapi/tbb/scalable_allocator.h>
-
-//#define DEBUG_FILES
-#ifdef DEBUG_FILES
-#include "libslic3r/SVG.hpp"
-#endif
-
-namespace Slic3r {
-
-// execute fn for each pixel on the line. If fn returns false, terminate the iteration
-template<typename PointFn> void dda(coord_t x0, coord_t y0, coord_t x1, coord_t y1, const PointFn &fn)
-{
-    coord_t dx    = abs(x1 - x0);
-    coord_t dy    = abs(y1 - y0);
-    coord_t x     = x0;
-    coord_t y     = y0;
-    coord_t n     = 1 + dx + dy;
-    coord_t x_inc = (x1 > x0) ? 1 : -1;
-    coord_t y_inc = (y1 > y0) ? 1 : -1;
-    coord_t error = dx - dy;
-    dx *= 2;
-    dy *= 2;
-
-    for (; n > 0; --n) {
-        if (!fn(x, y)) return;
-
-        if (error > 0) {
-            x += x_inc;
-            error -= dy;
-        } else {
-            y += y_inc;
-            error += dx;
-        }
-    }
-}
-
-// will draw the line twice, second time with and offset of 1 in the direction of normal
-// may call the fn on the same coordiantes multiple times!
-template<typename PointFn> void double_dda_with_offset(coord_t x0, coord_t y0, coord_t x1, coord_t y1, const PointFn &fn)
-{
-    Vec2d normal       = Point{y1 - y0, x1 - x0}.cast<double>().normalized();
-    normal.x()         = ceil(normal.x());
-    normal.y()         = ceil(normal.y());
-    Point start_offset = Point(x0, y0) + (normal).cast<coord_t>();
-    Point end_offset   = Point(x1, y1) + (normal).cast<coord_t>();
-
-    dda(x0, y0, x1, y1, fn);
-    dda(start_offset.x(), start_offset.y(), end_offset.x(), end_offset.y(), fn);
-}
-
-template<typename CellPositionType, typename CellQueryFn> class JPSTracer
-{
-public:
-    // Use incoming_dir [0,0] for starting points, so that all directions are checked from that point
-    struct Node
-    {
-        CellPositionType position;
-        CellPositionType incoming_dir;
-    };
-
-    JPSTracer(CellPositionType target, CellQueryFn is_passable) : target(target), is_passable(is_passable) {}
-
-private:
-    CellPositionType target;
-    CellQueryFn      is_passable; // should return boolean whether the cell is passable or not
-
-    CellPositionType find_jump_point(CellPositionType start, CellPositionType forward_dir) const
-    {
-        CellPositionType next = start + forward_dir;
-        while (next != target && is_passable(next) && !(is_jump_point(next, forward_dir))) { next = next + forward_dir; }
-
-        if (is_passable(next)) {
-            return next;
-        } else {
-            return start;
-        }
-    }
-
-    bool is_jump_point(CellPositionType pos, CellPositionType forward_dir) const
-    {
-        if (abs(forward_dir.x()) + abs(forward_dir.y()) == 2) {
-            // diagonal
-            CellPositionType horizontal_check_dir = CellPositionType{forward_dir.x(), 0};
-            CellPositionType vertical_check_dir   = CellPositionType{0, forward_dir.y()};
-
-            if (!is_passable(pos - horizontal_check_dir) && is_passable(pos + forward_dir - 2 * horizontal_check_dir)) { return true; }
-
-            if (!is_passable(pos - vertical_check_dir) && is_passable(pos + forward_dir - 2 * vertical_check_dir)) { return true; }
-
-            if (find_jump_point(pos, horizontal_check_dir) != pos) { return true; }
-
-            if (find_jump_point(pos, vertical_check_dir) != pos) { return true; }
-
-            return false;
-        } else { // horizontal or vertical
-            CellPositionType side_dir = CellPositionType(forward_dir.y(), forward_dir.x());
-
-            if (!is_passable(pos + side_dir) && is_passable(pos + forward_dir + side_dir)) { return true; }
-
-            if (!is_passable(pos - side_dir) && is_passable(pos + forward_dir - side_dir)) { return true; }
-
-            return false;
-        }
-    }
-
-public:
-    template<class Fn> void foreach_reachable(const Node &from, Fn &&fn) const
-    {
-        const CellPositionType &      pos         = from.position;
-        const CellPositionType &      forward_dir = from.incoming_dir;
-        std::vector<CellPositionType> dirs_to_check{};
-
-        if (abs(forward_dir.x()) + abs(forward_dir.y()) == 0) { // special case for starting point
-            dirs_to_check = all_directions;
-        } else if (abs(forward_dir.x()) + abs(forward_dir.y()) == 2) {
-            // diagonal
-            CellPositionType horizontal_check_dir = CellPositionType{forward_dir.x(), 0};
-            CellPositionType vertical_check_dir   = CellPositionType{0, forward_dir.y()};
-
-            if (!is_passable(pos - horizontal_check_dir) && is_passable(pos + forward_dir - 2 * horizontal_check_dir)) {
-                dirs_to_check.push_back(forward_dir - 2 * horizontal_check_dir);
-            }
-
-            if (!is_passable(pos - vertical_check_dir) && is_passable(pos + forward_dir - 2 * vertical_check_dir)) {
-                dirs_to_check.push_back(forward_dir - 2 * vertical_check_dir);
-            }
-
-            dirs_to_check.push_back(horizontal_check_dir);
-            dirs_to_check.push_back(vertical_check_dir);
-            dirs_to_check.push_back(forward_dir);
-
-        } else { // horizontal or vertical
-            CellPositionType side_dir = CellPositionType(forward_dir.y(), forward_dir.x());
-
-            if (!is_passable(pos + side_dir) && is_passable(pos + forward_dir + side_dir)) { dirs_to_check.push_back(forward_dir + side_dir); }
-
-            if (!is_passable(pos - side_dir) && is_passable(pos + forward_dir - side_dir)) { dirs_to_check.push_back(forward_dir - side_dir); }
-            dirs_to_check.push_back(forward_dir);
-        }
-
-        for (const CellPositionType &dir : dirs_to_check) {
-            CellPositionType jp = find_jump_point(pos, dir);
-            if (jp != pos) fn(Node{jp, dir});
-        }
-    }
-
-    float distance(Node a, Node b) const { return (a.position - b.position).template cast<double>().norm(); }
-
-    float goal_heuristic(Node n) const { return n.position == target ? -1.f : (target - n.position).template cast<double>().norm(); }
-
-    size_t unique_id(Node n) const { return (static_cast<size_t>(uint16_t(n.position.x())) << 16) + static_cast<size_t>(uint16_t(n.position.y())); }
-
-    const std::vector<CellPositionType> all_directions{{1, 0}, {1, 1}, {0, 1}, {-1, 1}, {-1, 0}, {-1, -1}, {0, -1}, {1, -1}};
-};
-
-void JPSPathFinder::clear()
-{
-    inpassable.clear();
-    max_search_box.max = Pixel(std::numeric_limits<coord_t>::min(), std::numeric_limits<coord_t>::min());
-    max_search_box.min = Pixel(std::numeric_limits<coord_t>::max(), std::numeric_limits<coord_t>::max());
-    add_obstacles(bed_shape);
-}
-
-void JPSPathFinder::add_obstacles(const Lines &obstacles)
-{
-    auto store_obstacle = [&](coord_t x, coord_t y) {
-        max_search_box.max.x() = std::max(max_search_box.max.x(), x);
-        max_search_box.max.y() = std::max(max_search_box.max.y(), y);
-        max_search_box.min.x() = std::min(max_search_box.min.x(), x);
-        max_search_box.min.y() = std::min(max_search_box.min.y(), y);
-        inpassable.insert(Pixel{x, y});
-        return true;
-    };
-
-    for (const Line &l : obstacles) {
-        Pixel start = pixelize(l.a);
-        Pixel end   = pixelize(l.b);
-        double_dda_with_offset(start.x(), start.y(), end.x(), end.y(), store_obstacle);
-    }
-}
-
-Polyline JPSPathFinder::find_path(const Point &p0, const Point &p1)
-{
-    Pixel start = pixelize(p0);
-    Pixel end   = pixelize(p1);
-    if (inpassable.empty() || (start - end).cast<float>().norm() < 3.0) { return Polyline{p0, p1}; }
-
-    if (inpassable.find(start) != inpassable.end()) {
-        dda(start.x(), start.y(), end.x(), end.y(), [&](coord_t x, coord_t y) {
-            if (inpassable.find(Pixel(x, y)) == inpassable.end() || start == end) { // new start not found yet, and xy passable
-                start = Pixel(x, y);
-                return false;
-            }
-            return true;
-        });
-    }
-
-    if (inpassable.find(end) != inpassable.end()) {
-        dda(end.x(), end.y(), start.x(), start.y(), [&](coord_t x, coord_t y) {
-            if (inpassable.find(Pixel(x, y)) == inpassable.end() || start == end) { // new start not found yet, and xy passable
-                end = Pixel(x, y);
-                return false;
-            }
-            return true;
-        });
-    }
-
-    BoundingBox search_box = max_search_box;
-    search_box.max -= Pixel(1, 1);
-    search_box.min += Pixel(1, 1);
-
-    BoundingBox bounding_square(Points{start, end});
-    bounding_square.max += Pixel(5, 5);
-    bounding_square.min -= Pixel(5, 5);
-    coord_t bounding_square_size = 2 * std::max(bounding_square.size().x(), bounding_square.size().y());
-    bounding_square.max.x() += (bounding_square_size - bounding_square.size().x()) / 2;
-    bounding_square.min.x() -= (bounding_square_size - bounding_square.size().x()) / 2;
-    bounding_square.max.y() += (bounding_square_size - bounding_square.size().y()) / 2;
-    bounding_square.min.y() -= (bounding_square_size - bounding_square.size().y()) / 2;
-
-    // Intersection - limit the search box to a square area around the start and end, to fasten the path searching
-    search_box.max = search_box.max.cwiseMin(bounding_square.max);
-    search_box.min = search_box.min.cwiseMax(bounding_square.min);
-
-    auto cell_query = [&](Pixel pixel) { return search_box.contains(pixel) && (pixel == start || pixel == end || inpassable.find(pixel) == inpassable.end()); };
-
-    JPSTracer<Pixel, decltype(cell_query)> tracer(end, cell_query);
-    using QNode = astar::QNode<JPSTracer<Pixel, decltype(cell_query)>>;
-
-    std::unordered_map<size_t, QNode>          astar_cache{};
-    std::vector<Pixel, PointsAllocator<Pixel>> out_path;
-    std::vector<decltype(tracer)::Node>        out_nodes;
-
-    if (!astar::search_route(tracer, {start, {0, 0}}, std::back_inserter(out_nodes), astar_cache)) {
-        // path not found - just reconstruct the best path from astar cache.
-        // Note that astar_cache is NOT empty - at least the starting point should always be there
-        auto                coordiante_func = [&astar_cache](size_t idx, size_t dim) { return float(astar_cache[idx].node.position[dim]); };
-        std::vector<size_t> keys;
-        keys.reserve(astar_cache.size());
-        for (const auto &pair : astar_cache) { keys.push_back(pair.first); }
-        KDTreeIndirect<2, float, decltype(coordiante_func)> kd_tree(coordiante_func, keys);
-        size_t                                              closest_qnode = find_closest_point(kd_tree, end.cast<float>());
-
-        out_path.push_back(end);
-        while (closest_qnode != astar::Unassigned) {
-            out_path.push_back(astar_cache[closest_qnode].node.position);
-            closest_qnode = astar_cache[closest_qnode].parent;
-        }
-    } else {
-        for (const auto &node : out_nodes) { out_path.push_back(node.position); }
-        out_path.push_back(start);
-    }
-
-#ifdef DEBUG_FILES
-    auto scaled_points = [](const Points &ps) {
-        Points r;
-        for (const Point &p : ps) { r.push_back(Point::new_scale(p.x(), p.y())); }
-        return r;
-    };
-    auto          scaled_point = [](const Point &p) { return Point::new_scale(p.x(), p.y()); };
-    ::Slic3r::SVG svg(debug_out_path(("path_jps" + std::to_string(print_z) + "_" + std::to_string(rand() % 1000)).c_str()).c_str(),
-                      BoundingBox(scaled_point(search_box.min), scaled_point(search_box.max)));
-    for (const auto &p : inpassable) { svg.draw(scaled_point(p), "black", scale_(0.4)); }
-    for (const auto &qn : astar_cache) { svg.draw(scaled_point(qn.second.node.position), "blue", scale_(0.3)); }
-    svg.draw(Polyline(scaled_points(out_path)), "yellow", scale_(0.25));
-    svg.draw(scaled_point(end), "purple", scale_(0.4));
-    svg.draw(scaled_point(start), "green", scale_(0.4));
-#endif
-
-    std::vector<Pixel, PointsAllocator<Pixel>> tmp_path;
-    tmp_path.reserve(out_path.size());
-    // Some path found, reverse and remove points that do not change direction
-    std::reverse(out_path.begin(), out_path.end());
-    {
-        tmp_path.push_back(out_path.front()); // first point
-        for (size_t i = 1; i < out_path.size() - 1; i++) {
-            if ((out_path[i] - out_path[i - 1]).cast<float>().normalized() != (out_path[i + 1] - out_path[i]).cast<float>().normalized()) { tmp_path.push_back(out_path[i]); }
-        }
-        tmp_path.push_back(out_path.back()); // last_point
-        out_path = tmp_path;
-    }
-
-#ifdef DEBUG_FILES
-    svg.draw(Polyline(scaled_points(out_path)), "orange", scale_(0.20));
-#endif
-
-    tmp_path.clear();
-    // remove redundant jump points - there are points that change direction but are not needed - this inefficiency arises from the
-    // usage of grid search The removal alg tries to find the longest Px Px+k path without obstacles. If Px Px+k+1 is blocked, it will
-    // insert the Px+k point to result and continue search from Px+k
-    {
-        tmp_path.push_back(out_path.front()); // first point
-        size_t index_of_last_stored_point = 0;
-        for (size_t i = 1; i < out_path.size(); i++) {
-            if (i - index_of_last_stored_point < 2) continue;
-            bool passable       = true;
-            auto store_obstacle = [&](coord_t x, coord_t y) {
-                if (Pixel(x, y) != start && Pixel(x, y) != end && inpassable.find(Pixel(x, y)) != inpassable.end()) {
-                    passable = false;
-                    return false;
-                }
-                return true;
-            };
-            dda(tmp_path.back().x(), tmp_path.back().y(), out_path[i].x(), out_path[i].y(), store_obstacle);
-            if (!passable) {
-                tmp_path.push_back(out_path[i - 1]);
-                index_of_last_stored_point = i - 1;
-            }
-        }
-        tmp_path.push_back(out_path.back()); // last_point
-        out_path = tmp_path;
-    }
-
-#ifdef DEBUG_FILES
-    svg.draw(Polyline(scaled_points(out_path)), "red", scale_(0.15));
-    svg.Close();
-#endif
-
-    // before returing the path, transform it from pixels back to points.
-    // Also replace the first and last pixel by input points so that result path patches input params exactly.
-    for (Pixel &p : out_path) { p = unpixelize(p); }
-    out_path.front() = p0;
-    out_path.back()  = p1;
-
-    return Polyline(out_path);
-}
-
-} // namespace Slic3r
@@ -1,39 +0,0 @@
-#pragma once
-#include "Line.hpp"
-#ifndef SRC_LIBSLIC3R_JUMPPOINTSEARCH_HPP_
-#define SRC_LIBSLIC3R_JUMPPOINTSEARCH_HPP_
-
-#include "BoundingBox.hpp"
-#include "Polygon.hpp"
-#include "libslic3r/Layer.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/Polyline.hpp"
-#include "libslic3r/libslic3r.h"
-#include <unordered_map>
-#include <unordered_set>
-
-namespace Slic3r {
-
-class JPSPathFinder
-{
-    using Pixel = Point;
-    std::unordered_set<Pixel, PointHash> inpassable;
-    coordf_t                             print_z;
-    BoundingBox                          max_search_box;
-    Lines                                bed_shape;
-
-    const coord_t resolution = scaled(1.5);
-    Pixel         pixelize(const Point &p) { return p / resolution; }
-    Point         unpixelize(const Pixel &p) { return p * resolution; }
-
-public:
-    JPSPathFinder() = default;
-    void     init_bed_shape(const Points &bed_shape) { this->bed_shape = (to_lines(Polygon{bed_shape})); };
-    void     clear();
-    void     add_obstacles(const Lines &obstacles);
-    Polyline find_path(const Point &start, const Point &end);
-};
-
-} // namespace Slic3r
-
-#endif /* SRC_LIBSLIC3R_JUMPPOINTSEARCH_HPP_ */
@@ -353,6 +353,24 @@ Model Model::read_from_file(const std::string&
        ObjInfo                 obj_info;
        ObjParser::MtlData      mtl_data;
        result = load_obj(input_file.c_str(), &model, obj_info, message, nullptr, &mtl_data);
+        // Keep the model's own UV channel on the volume, whatever the colour import then does with
+        // the mesh: it is what TextureProjectionMethod::ModelUV maps a texture-displacement layer
+        // through, so a model that arrives with a UV layout is textured on that layout instead of on
+        // a fresh unwrap. load_obj() fills obj_info.uvs per face of the mesh it built, in the same
+        // order (and only when every face named a known material, hence the size check). V is flipped
+        // on the way in, to the convention DecodedHeightTexture samples in - the same flip
+        // obj_to_textured_mesh() does for the colour importer.
+        if (result && !obj_info.uvs.empty() && !model.objects.empty() && !model.objects.back()->volumes.empty()) {
+            ModelVolume                &volume = *model.objects.back()->volumes[0];
+            const indexed_triangle_set &its    = volume.mesh().its;
+            if (obj_info.uvs.size() == its.indices.size()) {
+                volume.texture_uv.resize(its.indices.size() * 3);
+                for (size_t fi = 0; fi < obj_info.uvs.size(); ++fi)
+                    for (int k = 0; k < 3; ++k)
+                        volume.texture_uv[fi * 3 + size_t(k)] =
+                            Vec2f(obj_info.uvs[fi][size_t(k)].x(), 1.f - obj_info.uvs[fi][size_t(k)].y());
+            }
+        }
        if (result && obj_info.has_uv_png && !obj_info.uvs.empty() && !model.objects.empty()) {
            // Textured OBJ: hand the mesh + materials to the texture-to-color importer
            // instead of the flat per-face colour dialog.
@@ -2133,6 +2151,10 @@ void ModelVolume::reset_extra_facets()
    // than left referring to a mesh that no longer matches it.
    for (int i = 0; i < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++i)
        this->texture_displacement_facet(i).reset();
+    // Same reasoning for the model's own UV channel: it is indexed by triangle, so against a mesh
+    // this no longer matches it would map the texture by another mesh's triangle numbering. A caller
+    // that can carry it across - see transfer_uv_channel() - puts it back after this.
+    this->reset_texture_uv();
 }

 std::optional<TriangleSelector::SavedPainting> ModelVolume::save_painting() const
@@ -974,6 +974,26 @@ public:
    // they are not a property of any single layer.
    TextureDisplacementOptions texture_displacement_options;

+    // The model's own texture coordinates, as the file it was imported from carried them: three per
+    // triangle of mesh().its, in its triangle order (corner k of triangle i at 3i+k), V already
+    // flipped to the sampling convention (V = 0 is the image's top row). Empty when the source had
+    // none, which is every STL and every 3mf - only a textured OBJ brings one in today.
+    //
+    // Per corner rather than per vertex because that is what a UV layout is: the two sides of a seam
+    // are the same vertex with two different coordinates, and collapsing them would smear the texture
+    // across every island boundary. TextureProjectionMethod::ModelUV maps through it, which is what
+    // lets a model that already carries a UV channel be textured on the artist's own layout instead
+    // of on a fresh unwrap.
+    //
+    // Indexed by triangle, so anything that *replaces* the mesh has to bring it across (or drop it):
+    // see transfer_uv_channel(), and reset_texture_uv() for the cases that cannot.
+    std::vector<Vec2f> texture_uv;
+
+    bool has_texture_uv() const { return !texture_uv.empty() && texture_uv.size() == mesh().its.indices.size() * 3; }
+    // Forgets the channel. For a mesh change that nothing can carry it across - a split, a boolean -
+    // where leaving it would map the texture by another mesh's triangle numbering.
+    void reset_texture_uv() { texture_uv.clear(); }
+
    // Save painting data before reset_extra_facets() discards it.
    // Used for replacing mesh without losing painting data.
    // Only for model parts (not modifiers/connectors).
@@ -1236,6 +1256,7 @@ private:
        texture_displacement_facets_6(other.texture_displacement_facets_6), texture_displacement_facets_7(other.texture_displacement_facets_7),
        texture_displacement_layers(other.texture_displacement_layers),
        texture_displacement_options(other.texture_displacement_options),
+        texture_uv(other.texture_uv),
        cut_info(other.cut_info), text_configuration(other.text_configuration), emboss_shape(other.emboss_shape)
    {
 		assert(this->id().valid());
@@ -1334,7 +1355,7 @@ private:
            cereal::load_by_value(ar, f);
            mesh_changed |= tf != f.timestamp();
        }
-        ar(texture_displacement_layers, texture_displacement_options);
+        ar(texture_displacement_layers, texture_displacement_options, texture_uv);
        cereal::load_by_value(ar, config);
        cereal::load(ar, text_configuration);
        cereal::load(ar, emboss_shape);
@@ -1358,7 +1379,7 @@ private:
        cereal::save_by_value(ar, fuzzy_skin_facets);
        for (int i = 0; i < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++i)
            cereal::save_by_value(ar, texture_displacement_facet(i));
-        ar(texture_displacement_layers, texture_displacement_options);
+        ar(texture_displacement_layers, texture_displacement_options, texture_uv);
        cereal::save_by_value(ar, config);
        cereal::save(ar, text_configuration);
        cereal::save(ar, emboss_shape);
@@ -4102,11 +4102,7 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info)
        auto  ams_name             = ams.opt_string("tray_name", 0u);
        auto  filament_changed     = !ams.has("filament_changed") || ams.opt_bool("filament_changed");
        auto  filament_multi_color = ams.opt<ConfigOptionStrings>("filament_multi_colour")->values;
-        auto  filament_type        = ams.opt_string("filament_type", 0u);
-        auto  is_placeholder       = ams.has("filament_slot_placeholder") && ams.opt_bool("filament_slot_placeholder", 0u);
-        // A printer-set tray carries a material type but no preset id; resolve it to the
-        // matching Generic preset so it is not dropped and the combo array keeps aligning.
-        if (filament_id.empty() && (is_placeholder || filament_type.empty())) {
+        if (filament_id.empty()) {
            continue;
        }
        if (!filament_changed && this->filament_presets.size() > combox_info.ams_filament_presets.size()) {
@@ -4116,48 +4112,16 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info)
            combox_info.ams_names.push_back(ams_name);
            continue;
        }
-        auto iter = filaments.end();
-        if (!filament_id.empty()) {
-            iter = std::find_if(filaments.begin(), filaments.end(),
-                                [this, &filament_id](auto &f) { return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; });
-            warn_ambiguous_filament_id_match(filaments, iter, filament_id);
-        }
+        auto iter = std::find_if(filaments.begin(), filaments.end(),
+                                 [this, &filament_id](auto &f) { return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; });
+        warn_ambiguous_filament_id_match(filaments, iter, filament_id);
        if (iter == filaments.end()) {
            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": filament_id %1% not found or system or compatible") % filament_id;
+            auto filament_type = ams.opt_string("filament_type", 0u);
            if (!filament_type.empty()) {
-                auto original_type = filament_type;
                filament_type = "Generic " + filament_type;
                iter          = std::find_if(filaments.begin(), filaments.end(),
                                    [&filament_type](auto &f) { return f.is_compatible && f.is_system && boost::algorithm::starts_with(f.name, filament_type); });
-                if (iter == filaments.end()) {
-                    // Similarity fallback: find a generic preset whose filament_type
-                    // appears as a whole word in the AMS type (e.g. "ASA" in "ASA Sparkle").
-                    auto upper_type = boost::to_upper_copy(original_type);
-                    auto contains_word = [](const std::string& haystack, const std::string& needle) {
-                        auto pos = haystack.find(needle);
-                        while (pos != std::string::npos) {
-                            bool start_ok = (pos == 0 || !std::isalnum(static_cast<unsigned char>(haystack[pos - 1])));
-                            bool end_ok   = (pos + needle.size() >= haystack.size() ||
-                                             !std::isalnum(static_cast<unsigned char>(haystack[pos + needle.size()])));
-                            if (start_ok && end_ok)
-                                return true;
-                            pos = haystack.find(needle, pos + 1);
-                        }
-                        return false;
-                    };
-                    // Find the longest-matching preset type to prefer e.g. "PA-CF" over "PA".
-                    size_t best_len = 0;
-                    for (auto it = filaments.begin(); it != filaments.end(); ++it) {
-                        if (!it->is_compatible || !it->is_system || !boost::algorithm::starts_with(it->name, "Generic "))
-                            continue;
-                        auto preset_type = boost::to_upper_copy(it->config.opt_string("filament_type", 0u));
-                        if (preset_type.size() > best_len && contains_word(upper_type, preset_type)) {
-                            iter = it;
-                            best_len = preset_type.size();
-                            filament_type = "Generic " + it->config.opt_string("filament_type", 0u);
-                        }
-                    }
-                }
            }
            if (iter == filaments.end()) {
                // Prefer old selection
@@ -4168,11 +4132,7 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info)
                    combox_info.ams_names.push_back(ams_name);
                    continue;
                }
-                iter = std::find_if(filaments.begin(), filaments.end(), [](auto &f) {
-                    return f.is_compatible && f.is_system && boost::algorithm::starts_with(f.name, "Generic ");
-                });
-                if (iter == filaments.end())
-                    iter = std::find_if(filaments.begin(), filaments.end(), [](auto &f) { return f.is_compatible && f.is_system; });
+                iter = std::find_if(filaments.begin(), filaments.end(), [](auto &f) { return f.is_compatible && f.is_system; });
                if (iter == filaments.end())
                    continue;
            }
@@ -4210,7 +4170,6 @@ unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfi
    for (auto &entry : filament_ams_list) {
        auto & ams = entry.second;
        auto filament_id = ams.opt_string("filament_id", 0u);
-        const bool printer_set_tray = filament_id.empty();
        auto filament_color = ams.opt_string("filament_colour", 0u);
        auto filament_color_type = ams.opt_string("filament_colour_type", 0u);
        auto filament_changed = !ams.has("filament_changed") || ams.opt_bool("filament_changed");
@@ -4223,58 +4182,42 @@ unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfi
        ams_array_maps.push_back(temp);
        index++;
        if (filament_id.empty()) {
-            // A tray written by the printer UI carries a material type but no
-            // OrcaSlicer preset id. Resolve it to the matching Generic preset with
-            // the tray's own color instead of dropping it (direct sync) or forcing
-            // "Generic PLA" (mapping sync). Placeholders and typeless trays keep
-            // the previous behavior.
-            const auto tray_type = ams.opt_string("filament_type", 0u);
-            if (is_placeholder || tray_type.empty()) {
-                if (use_map) {
-                    for (int j = maps.size() - 1; j >= 0; j--) {
-                        if (maps[j].slot_id == slot_id && maps[j].ams_id == ams_id) {
-                            maps.erase(j);
-                        }
+            if (use_map) {
+                for (int j = maps.size() - 1; j >= 0; j--) {
+                    if (maps[j].slot_id == slot_id && maps[j].ams_id == ams_id) {
+                        maps.erase(j);
                    }
-                    ams_filament_presets.push_back("Generic PLA");//for unknow matieral
-                    auto default_unknown_color = "#CECECE";
-                    ams_filament_colors.push_back(default_unknown_color);
-                    ams_filament_color_types.push_back("1");
-                    if (filament_multi_color.size() == 0) {
-                        filament_multi_color.push_back(default_unknown_color);
-                    }
-                    ams_multi_color_filment.push_back(filament_multi_color);
-                } else if (is_placeholder) {
-                    // Orca: push placeholders to keep index alignment with ams_infos
-                    ams_filament_presets.push_back("");
-                    ams_filament_colors.push_back("");
-                    ams_filament_color_types.push_back("");
-                    ams_multi_color_filment.push_back({});
                }
-                continue;
+                ams_filament_presets.push_back("Generic PLA");//for unknow matieral
+                auto default_unknown_color = "#CECECE";
+                ams_filament_colors.push_back(default_unknown_color);
+                ams_filament_color_types.push_back("1");
+                if (filament_multi_color.size() == 0) {
+                    filament_multi_color.push_back(default_unknown_color);
+                }
+                ams_multi_color_filment.push_back(filament_multi_color);
+            } else if (is_placeholder) {
+                // Orca: push placeholders to keep index alignment with ams_infos
+                ams_filament_presets.push_back("");
+                ams_filament_colors.push_back("");
+                ams_filament_color_types.push_back("");
+                ams_multi_color_filment.push_back({});
            }
+            continue;
        }
        if (!filament_changed && this->filament_presets.size() > ams_filament_presets.size()) {
            ams_filament_presets.push_back(this->filament_presets[ams_filament_presets.size()]);
            ams_filament_colors.push_back(filament_color);
            ams_filament_color_types.push_back(filament_color_type);
            ams_multi_color_filment.push_back(filament_multi_color);
-            ams_infos.back().valid = true;
            continue;
        }
        bool has_type = false;
        auto filament_type = ams.opt_string("filament_type", 0u);
-        auto iter = filaments.end();
-        if (!filament_id.empty()) {
-            iter = std::find_if(filaments.begin(), filaments.end(), [this, &filament_id, &has_type, filament_type](auto &f) {
-                has_type |= f.config.opt_string("filament_type", 0u) == filament_type;
-                return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; });
-            warn_ambiguous_filament_id_match(filaments, iter, filament_id);
-        } else {
-            // The material type is the only identity a printer-set tray carries.
-            has_type = std::any_of(filaments.begin(), filaments.end(), [&filament_type](auto &f) {
-                return f.is_compatible && f.config.opt_string("filament_type", 0u) == filament_type; });
-        }
+        auto iter = std::find_if(filaments.begin(), filaments.end(), [this, &filament_id, &has_type, filament_type](auto &f) {
+            has_type |= f.config.opt_string("filament_type", 0u) == filament_type;
+            return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; });
+        warn_ambiguous_filament_id_match(filaments, iter, filament_id);
        if (iter == filaments.end()) {
            BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": filament_id %1% not found or system or compatible") % filament_id;
            if (!filament_type.empty()) {
@@ -4314,7 +4257,6 @@ unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfi
                    }
                }
            }
-            const bool resolved_by_material_type = printer_set_tray && iter != filaments.end();
            if (iter == filaments.end()) {
                // Prefer old selection
                if (ams_filament_presets.size() < this->filament_presets.size()) {
@@ -4322,7 +4264,6 @@ unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfi
                    ams_filament_colors.push_back(filament_color);
                    ams_filament_color_types.push_back(filament_color_type);
                    ams_multi_color_filment.push_back(filament_multi_color);
-                    ams_infos.back().valid = true;
                    unknowns.emplace_back(&ams, has_type ? L("The filament may not be compatible with the current machine settings. Generic filament presets will be used.") :
                                                           L("The filament model is unknown. Still using the previous filament preset."));
                    continue;
@@ -4338,8 +4279,7 @@ unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfi
                if (iter == filaments.end())
                    continue;
            }
-            if (!resolved_by_material_type)
-                unknowns.emplace_back(&ams, boost::algorithm::starts_with(iter->name, filament_type) ?
+            unknowns.emplace_back(&ams, boost::algorithm::starts_with(iter->name, filament_type) ?
                                            (has_type ? L("The filament may not be compatible with the current machine settings. Generic filament presets will be used.") :
                                                        L("The filament model is unknown. Generic filament presets will be used.")) :
                                            (has_type ? L("The filament may not be compatible with the current machine settings. A random filament preset will be used.") :
@@ -4350,7 +4290,6 @@ unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfi
        ams_filament_colors.push_back(filament_color);
        ams_filament_color_types.push_back(filament_color_type);
        ams_multi_color_filment.push_back(filament_multi_color);
-        ams_infos.back().valid = true;
    }
    if (ams_filament_presets.empty())
        return 0;
@@ -4790,21 +4729,9 @@ std::vector<std::vector<DynamicPrintConfig>> PresetBundle::get_extruder_filament
    return filament_infos;
 }

-std::string PresetBundle::get_printer_model_display_name(const std::string &model_id) const
-{
-    if (model_id.empty())
-        return {};
-    for (const auto &vendor_entry : vendors) {
-        for (const auto &model : vendor_entry.second.models) {
-            if (model.model_id == model_id)
-                return model.name;
-        }
-    }
-    return {};
-}
-
-// ORCA TODO: this assumes printer names follow "<printer_model> <nozzle_diameter>", e.g.
-// "Bambu Lab X2D 0.4 nozzle". Other naming schemes may not resolve correctly.
+// ORCA TODO: currently, this function assumes the printer name follows the pattern of "<printer_model> <nozzle_diameter>", e.g.
+// printer_type: "Bambu Lab X2D", nozzle_diameter_str: "0.4 nozzle" => printer_name: "Bambu Lab X2D 0.4 nozzle". If the printer name does
+// not follow this pattern, the function may not work correctly.
 std::set<std::string> PresetBundle::get_printer_names_by_printer_type_and_nozzle(const std::string &printer_type, std::string nozzle_diameter_str, bool system_only)
 {
    std::set<std::string> printer_names;
@@ -4826,9 +4753,7 @@ std::set<std::string> PresetBundle::get_printer_names_by_printer_type_and_nozzle
        if (printer_it->name.find(nozzle_diameter_str) != std::string::npos) printer_names.insert(printer_it->name);
    }

-    // No match is normal for a connected machine the user has not installed; only an
-    // ambiguous match is a bug (the caller assumes one preset per model and nozzle).
-    assert(printer_names.size() <= 1);
+    assert(printer_names.size() == 1);

    for (auto& printer_name : printer_names) {
        BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << __LINE__ << " printer name: " << printer_name;
@@ -4841,8 +4766,8 @@ std::vector<Preset *> PresetBundle::get_filament_presets_for_machine(const std::
                                                                    const std::string &nozzle_diameter_str,
                                                                    bool               include_user_presets)
 {
-    // Printer model plus nozzle diameter normally resolves to a single system printer preset.
-    // Zero matches is normal for a connected machine the user never installed.
+    // Printer model plus nozzle diameter is expected to resolve to a single system printer preset;
+    // get_printer_names_by_printer_type_and_nozzle asserts as much in debug builds.
    const std::set<std::string> printer_names = get_printer_names_by_printer_type_and_nozzle(printer_type, nozzle_diameter_str);
    const Preset *printer = printer_names.empty() ? nullptr : printers.find_preset(*printer_names.begin());
    if (printer == nullptr)
@@ -413,9 +413,6 @@ public:

    std::vector<std::vector<DynamicPrintConfig>> get_extruder_filament_info() const;

-    // Resolve a vendor model id (an agent-reported machine identity) to the display name
-    // printer profiles use as printer_model. Empty when no loaded vendor declares it.
-    std::string get_printer_model_display_name(const std::string &model_id) const;
    std::set<std::string> get_printer_names_by_printer_type_and_nozzle(const std::string &printer_type, std::string nozzle_diameter_str, bool system_only = true);
    // Orca: the root filament presets a connected machine can use, resolved with the rule the rest
    // of the app applies (is_compatible_with_printer): an empty compatible_printers means every
@@ -19,6 +19,7 @@
 #include <mutex>
 #include <numeric>
 #include <optional>
+#include "nlohmann/json.hpp"
 #include <queue>
 #include <ratio>
 #include <string>
@@ -1570,6 +1571,61 @@ std::vector<TextureIsland> compute_connected_net(const PatchUnwrap &unwrap)
    return islands;
 }

+std::vector<uint8_t> transfer_facet_paint(const indexed_triangle_set                    &src_mesh,
+                                         const TriangleSelector::TriangleSplittingData &src_paint,
+                                         const indexed_triangle_set                    &dst_mesh)
+{
+    if (src_mesh.indices.empty() || dst_mesh.indices.empty() || src_paint.bitstream.empty())
+        return {};
+
+    const TriangleMesh src(src_mesh);
+    TriangleSelector   selector(src);
+    selector.deserialize(src_paint, false);
+
+    // Every sub-triangle of the source, each carrying its own state - NONE included, so the soup
+    // covers the whole surface and a foot point always lands on something. One soup rather than one
+    // tree per state: a foot point has one nearest triangle, and that triangle's state is the answer.
+    std::vector<indexed_triangle_set> per_state;
+    selector.get_facets(per_state);
+    indexed_triangle_set soup;
+    std::vector<uint8_t> label;
+    for (size_t st = 0; st < per_state.size(); ++st) {
+        const indexed_triangle_set &part = per_state[st];
+        if (part.indices.empty())
+            continue;
+        const int base = int(soup.vertices.size());
+        soup.vertices.insert(soup.vertices.end(), part.vertices.begin(), part.vertices.end());
+        for (const stl_triangle_vertex_indices &t : part.indices) {
+            soup.indices.emplace_back(t[0] + base, t[1] + base, t[2] + base);
+            label.push_back(uint8_t(st));
+        }
+    }
+    if (soup.indices.empty())
+        return {};
+
+    const AABBTreeIndirect::Tree3f tree =
+        AABBTreeIndirect::build_aabb_tree_over_indexed_triangle_set(soup.vertices, soup.indices);
+
+    std::vector<uint8_t> out(dst_mesh.indices.size(), 0);
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, dst_mesh.indices.size()),
+                      [&](const tbb::blocked_range<size_t> &range) {
+        for (size_t j = range.begin(); j < range.end(); ++j) {
+            const stl_triangle_vertex_indices &t = dst_mesh.indices[j];
+            // The centroid, not a corner: a facet takes one state, and its middle is the point that
+            // is inside it whatever the triangle looks like.
+            const Vec3f centroid = (dst_mesh.vertices[size_t(t[0])] + dst_mesh.vertices[size_t(t[1])] +
+                                    dst_mesh.vertices[size_t(t[2])]) / 3.f;
+            size_t      hit = 0;
+            Vec3f       foot;
+            const float d2 = AABBTreeIndirect::squared_distance_to_indexed_triangle_set(soup.vertices, soup.indices,
+                                                                                        tree, centroid, hit, foot);
+            if (d2 >= 0.f && hit < label.size())
+                out[j] = label[hit];
+        }
+    });
+    return out;
+}
+
 void average_island_scales(std::vector<TextureIsland> &islands)
 {
    if (islands.empty())
@@ -1672,6 +1728,110 @@ std::vector<Vec2f> compute_lscm_corner_uvs(const indexed_triangle_set &patch, co
    return corner;
 }

+// Barycentric weights of `p` inside triangle (a, b, c), as the pair that belongs with the edges
+// (b - a) and (c - a): p ~= (1 - w1 - w2) * a + w1 * b + w2 * c. `p` is projected onto the triangle's
+// plane, so a point a hair off the surface still reports the weights of its foot point. A degenerate
+// triangle reports its centroid, the only coordinate that means anything there.
+static void barycentric_weights(const Vec3f &a, const Vec3f &b, const Vec3f &c, const Vec3f &p, float &w1, float &w2)
+{
+    const Vec3f e0 = b - a, e1 = c - a, ep = p - a;
+    const float d00 = e0.dot(e0), d01 = e0.dot(e1), d11 = e1.dot(e1), dp0 = ep.dot(e0), dp1 = ep.dot(e1);
+    const float den = d00 * d11 - d01 * d01;
+    if (std::abs(den) <= 1e-20f) {
+        w1 = w2 = 1.f / 3.f;
+        return;
+    }
+    w1 = (d11 * dp0 - d01 * dp1) / den;
+    w2 = (d00 * dp1 - d01 * dp0) / den;
+}
+
+std::vector<Vec2f> compute_model_corner_uvs(const indexed_triangle_set &base_mesh,
+                                            const std::vector<Vec2f>   &model_uv,
+                                            const indexed_triangle_set &patch,
+                                            const std::vector<int>     &patch_source)
+{
+    if (patch.indices.empty() || model_uv.size() != base_mesh.indices.size() * 3 ||
+        patch_source.size() != patch.indices.size())
+        return {};
+
+    std::vector<Vec2f> corner(patch.indices.size() * 3, Vec2f::Zero());
+    for (size_t j = 0; j < patch.indices.size(); ++j) {
+        const int S = patch_source[j];
+        if (S < 0 || size_t(S) >= base_mesh.indices.size())
+            continue; // no source triangle: leave (0, 0), which the callers read as "no placement"
+        const stl_triangle_vertex_indices &src = base_mesh.indices[size_t(S)];
+        const Vec3f &a = base_mesh.vertices[size_t(src[0])];
+        const Vec3f &b = base_mesh.vertices[size_t(src[1])];
+        const Vec3f &c = base_mesh.vertices[size_t(src[2])];
+        const Vec2f *uv = &model_uv[size_t(S) * 3];
+        const stl_triangle_vertex_indices &tri = patch.indices[j];
+        for (int k = 0; k < 3; ++k) {
+            // An unsplit patch triangle is its source triangle, so its corners land exactly on a, b
+            // and c and this reproduces their uvs unchanged; a sub-triangle the brush cut gets the
+            // interpolated coordinate, which is the whole point of going through the barycentric.
+            float w1 = 0.f, w2 = 0.f;
+            barycentric_weights(a, b, c, patch.vertices[size_t(tri[k])], w1, w2);
+            corner[j * 3 + size_t(k)] = (1.f - w1 - w2) * uv[0] + w1 * uv[1] + w2 * uv[2];
+        }
+    }
+    return corner;
+}
+
+std::vector<Vec2f> collapse_corner_uvs(const indexed_triangle_set &patch, const std::vector<Vec2f> &corner)
+{
+    if (patch.indices.empty() || corner.size() != patch.indices.size() * 3)
+        return {};
+
+    std::vector<Vec2f> per_vertex(patch.vertices.size(), Vec2f::Zero());
+    std::vector<char>  seen(patch.vertices.size(), 0);
+    for (size_t j = 0; j < patch.indices.size(); ++j)
+        for (int k = 0; k < 3; ++k) {
+            const int vi = patch.indices[j][k];
+            if (vi < 0 || size_t(vi) >= per_vertex.size() || seen[size_t(vi)])
+                continue;
+            seen[size_t(vi)]       = 1;
+            per_vertex[size_t(vi)] = corner[j * 3 + size_t(k)];
+        }
+    return per_vertex;
+}
+
+std::vector<Vec2f> transfer_uv_channel(const indexed_triangle_set &src_mesh,
+                                       const std::vector<Vec2f>   &src_uv,
+                                       const indexed_triangle_set &dst_mesh,
+                                       float                       max_distance)
+{
+    if (src_mesh.indices.empty() || dst_mesh.indices.empty() || src_uv.size() != src_mesh.indices.size() * 3)
+        return {};
+
+    const AABBTreeIndirect::Tree3f tree =
+        AABBTreeIndirect::build_aabb_tree_over_indexed_triangle_set(src_mesh.vertices, src_mesh.indices);
+    const float limit2 = max_distance >= 0.f ? max_distance * max_distance : std::numeric_limits<float>::max();
+
+    std::vector<Vec2f> out(dst_mesh.indices.size() * 3, Vec2f::Zero());
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, dst_mesh.indices.size()),
+                      [&](const tbb::blocked_range<size_t> &range) {
+        for (size_t j = range.begin(); j < range.end(); ++j) {
+            const stl_triangle_vertex_indices &tri = dst_mesh.indices[j];
+            for (int k = 0; k < 3; ++k) {
+                const Vec3f &p = dst_mesh.vertices[size_t(tri[k])];
+                size_t       hit = 0;
+                Vec3f        foot;
+                const float  d2 = AABBTreeIndirect::squared_distance_to_indexed_triangle_set(
+                    src_mesh.vertices, src_mesh.indices, tree, p, hit, foot);
+                if (d2 < 0.f || d2 > limit2 || hit >= src_mesh.indices.size())
+                    continue; // nowhere near the source surface: (0, 0), as documented
+                const stl_triangle_vertex_indices &st = src_mesh.indices[hit];
+                float w1 = 0.f, w2 = 0.f;
+                barycentric_weights(src_mesh.vertices[size_t(st[0])], src_mesh.vertices[size_t(st[1])],
+                                    src_mesh.vertices[size_t(st[2])], foot, w1, w2);
+                const Vec2f *uv        = &src_uv[hit * 3];
+                out[j * 3 + size_t(k)] = (1.f - w1 - w2) * uv[0] + w1 * uv[1] + w2 * uv[2];
+            }
+        }
+    });
+    return out;
+}
+
 namespace {
 // apply_uv_transform()'s per-layer constants, worked out once. Triplanar sampling runs the transform
 // three times per point, and recomputing the rotation's cos/sin and the tiling reciprocal on every one
@@ -1681,13 +1841,16 @@ struct UVTransform
    float scale, cs, sn, aspect;
    Vec2f offset;

-    UVTransform(const TextureDisplacementLayer &layer, float aspect_)
+    // `normalized_uv` drops the two steps that only mean something for a coordinate measured on the
+    // model - the millimetre tiling scale and the non-square aspect correction - and keeps the
+    // rotation and offset. See apply_uv_transform(); TextureProjectionMethod::ModelUV is what needs it.
+    UVTransform(const TextureDisplacementLayer &layer, float aspect_, bool normalized_uv = false)
    {
-        scale = (layer.tiling_scale > 1e-6f) ? (1.f / layer.tiling_scale) : 1.f;
+        scale = (normalized_uv || layer.tiling_scale <= 1e-6f) ? 1.f : (1.f / layer.tiling_scale);
        const float rad = layer.rotation_deg * float(M_PI) / 180.f;
        cs     = std::cos(rad);
        sn     = std::sin(rad);
-        aspect = aspect_;
+        aspect = normalized_uv ? 1.f : aspect_;
        offset = layer.offset;
    }
    Vec2f operator()(const Vec2f &planar) const
@@ -1712,9 +1875,11 @@ inline Vec3f triplanar_weights(const Vec3f &normal)
 }
 } // namespace

-Vec2f apply_uv_transform(const Vec2f &planar, const TextureDisplacementLayer &layer, float aspect)
+Vec2f apply_uv_transform(const Vec2f &planar, const TextureDisplacementLayer &layer, float aspect, bool normalized_uv)
 {
-    const float scale = (layer.tiling_scale > 1e-6f) ? (1.f / layer.tiling_scale) : 1.f;
+    // A uv that is already normalized has no millimetre scale to divide by and no aspect to correct -
+    // see the header. UVTransform does the same, and the two must stay in step.
+    const float scale = (normalized_uv || layer.tiling_scale <= 1e-6f) ? 1.f : (1.f / layer.tiling_scale);
    const Vec2f scaled = planar * scale;

    const float rad = layer.rotation_deg * float(M_PI) / 180.f;
@@ -1732,7 +1897,7 @@ Vec2f apply_uv_transform(const Vec2f &planar, const TextureDisplacementLayer &la
    // Applied after the rotation, not before: scaling one axis of an already-rotated coordinate is a
    // shear, and doing it the other way round would make "Rotation" skew the pattern instead of
    // turning it.
-    if (aspect > 0.f && aspect != 1.f)
+    if (!normalized_uv && aspect > 0.f && aspect != 1.f)
        rotated.y() *= aspect;

    return rotated + layer.offset;
@@ -1757,6 +1922,9 @@ float blend_displacement(float accumulated, float value, TextureBlendMode mode)
                                                                        value;
        return accumulated / divisor;
    }
+    // Replaces instead of combining, so `accumulated` is deliberately unused: whatever the layers
+    // below put here is gone where this one is painted.
+    case TextureBlendMode::Override: return value;
    case TextureBlendMode::Add:
    default: return accumulated + value;
    }
@@ -1786,14 +1954,21 @@ float sample_layer_height(const DecodedHeightTexture &texture, const TextureDisp
    // apply_uv_transform()). Every projection except the projective "from view" one funnels through
    // here, so this one line is what makes them all aspect-correct.
    const float       aspect = (texture.height > 0) ? float(texture.width) / float(texture.height) : 1.f;
-    const UVTransform xf(layer, aspect);
+    // A ModelUV layer's precomputed uv is the model's own, already normalized; every other coordinate
+    // reaching the transform - the unwrap's, and every analytic projection's - is in millimetres. The
+    // `lscm_uv` test is what keeps the two apart: a ModelUV layer with no channel gets none, falls
+    // through to the millimetre methods below, and must be scaled like them.
+    const bool        normalized_uv = layer.projection_method == TextureProjectionMethod::ModelUV &&
+                                      lscm_uv != nullptr;
+    const UVTransform xf(layer, aspect, normalized_uv);
    auto sample_at = [&](const Vec2f &planar) {
        return texture.sample(xf(planar), layer.tile_enabled, layer.tile_method);
    };

-    // Precomputed per-patch LSCM solve wins over the layer's own method (see the header): the
-    // caller only passes it when the patch actually parameterized successfully, so a patch that
-    // failed to unwrap falls through to the analytic methods below as its documented fallback.
+    // A precomputed per-patch uv - the LSCM solve, or the model's own channel - wins over the layer's
+    // own method (see the header): the caller only passes it when the patch actually has one, so a
+    // patch that failed to unwrap, or a volume with no UV channel, falls through to the analytic
+    // methods below as its documented fallback.
    if (lscm_uv != nullptr)
        return sample_at(*lscm_uv);

@@ -1851,8 +2026,12 @@ bool sample_layer_color(const DecodedHeightTexture &texture, const TextureDispla
    // the two differ in what "nothing here" means. Height returns 0, which is a perfectly good height
    // (no displacement); colour has no such neutral value - black is a colour - so every path that
    // returns 0 there has to report false here instead, and the caller leaves the triangle uncoloured.
-    const float       aspect = (texture.height > 0) ? float(texture.width) / float(texture.height) : 1.f;
-    const UVTransform xf(layer, aspect);
+    const float       aspect        = (texture.height > 0) ? float(texture.width) / float(texture.height) : 1.f;
+    // Same reasoning as sample_layer_height(), and it has to match it exactly or a layer's colour and
+    // its relief would be read from different places in the image.
+    const bool        normalized_uv = layer.projection_method == TextureProjectionMethod::ModelUV &&
+                                      lscm_uv != nullptr;
+    const UVTransform xf(layer, aspect, normalized_uv);
    auto sample_at = [&](const Vec2f &planar) {
        return texture.sample_color(xf(planar), layer.tile_enabled, layer.tile_method);
    };
@@ -1866,6 +2045,8 @@ bool sample_layer_color(const DecodedHeightTexture &texture, const TextureDispla
    };

    if (lscm_uv != nullptr) {
+        // The coverage test goes through the same transform, so an untiled ModelUV layer is "there"
+        // exactly where the model's own uv lands inside the image.
        if (!covered(*lscm_uv))
            return false;
        out = sample_at(*lscm_uv);
@@ -2210,9 +2391,10 @@ indexed_triangle_set build_texture_displacement_v2(const indexed_triangle_set
                                                   const TextureColorRequest                   *color,
                                                   bool                                         flip_normals,
                                                   BakeStageRecorder                           *debug,
-                                                   TextureBakeStats                            *stats)
+                                                   TextureBakeStats                            *stats,
+                                                   const std::vector<Vec2f>                    *model_uv)
 {
-    HeightFieldSampler combined = make_combined_displacement_sampler(mesh, layers, facets_data);
+    HeightFieldSampler combined = make_combined_displacement_sampler(mesh, layers, facets_data, model_uv);
    if (!combined)
        return mesh; // nothing decodable to displace with

@@ -2382,7 +2564,8 @@ indexed_triangle_set build_texture_displacement_v2(const indexed_triangle_set
    // part of it (half a tile in the neighbour's colour, a tile edge that wanders).
    const bool              want_color = color != nullptr && color->out_triangle != nullptr && bool(color->quantize);
    const ColorFieldSampler color_sampler =
-        want_color ? make_combined_color_sampler(mesh, layers, facets_data, color->quantize, color->quantize_pure) : ColorFieldSampler{};
+        want_color ? make_combined_color_sampler(mesh, layers, facets_data, color->quantize, color->quantize_pure, model_uv) :
+                     ColorFieldSampler{};
    //
    // The *palette* index, not the printed filament. The decimation treats any edge whose two faces
    // differ as a crease (TextureBakeDecimate.cpp), so it must only ever see where the **perceived**
@@ -2514,7 +2697,8 @@ static indexed_triangle_set build_texture_displacement_in_place(
    const TextureColorRequest                   *color,
    bool                                         flip_normals,
    BakeStageRecorder                           *debug,
-    TextureBakeStats                            *stats)
+    TextureBakeStats                            *stats,
+    const std::vector<Vec2f>                    *model_uv)
 {
    // The classic path moves the vertices the mesh already has, so there is no budget to report on.
    (void) stats;
@@ -2551,7 +2735,7 @@ static indexed_triangle_set build_texture_displacement_in_place(

    if (options.pipeline_v2)
        return build_texture_displacement_v2(mesh, layers, facets_data, options, progress, color, flip_normals,
-                                             debug, stats);
+                                             debug, stats, model_uv);

    // Layers are combined in slot order, like stacked layers in an image editor: each one folds its
    // own displacement into the running total via its blend mode (see TextureBlendMode).
@@ -2669,13 +2853,19 @@ static indexed_triangle_set build_texture_displacement_in_place(
        selector_dirty = true;

        const bool       color_this_layer = want_color && layer->color_enabled;
+        // The model's own channel is per base-mesh *triangle*, so reading it needs to know which base
+        // triangle each (possibly brush-split) patch triangle came from - the colour pass's map, asked
+        // for here as well.
+        const bool       model_uv_layer   = layer->projection_method == TextureProjectionMethod::ModelUV &&
+                                            model_uv != nullptr && model_uv->size() == mesh.indices.size() * 3;
        // A flat-colour image is matched against the filaments alone (see TextureColorRequest).
        const ColorQuantizeFn &layer_quantize =
            (color_this_layer && color->quantize_pure && analyze_texture_detail(*layer).flat_colors) ? color->quantize_pure
                                                                                                     : color->quantize;
-        std::vector<int> patch_source; // sub-triangle -> base mesh triangle, only built when colouring
+        std::vector<int> patch_source; // sub-triangle -> base mesh triangle; built when colouring or mapping by ModelUV
        const indexed_triangle_set patch =
-            selector.get_facets_strict(EnforcerBlockerType::ENFORCER, color_this_layer ? &patch_source : nullptr);
+            selector.get_facets_strict(EnforcerBlockerType::ENFORCER,
+                                       (color_this_layer || model_uv_layer) ? &patch_source : nullptr);
        if (patch.indices.empty())
            continue;
        // get_facets_strict() returns the same vertex array whichever state is asked for (only the
@@ -2706,18 +2896,25 @@ static indexed_triangle_set build_texture_displacement_in_place(
        // A real unwrap of the whole patch, computed once here rather than per vertex - it is a
        // per-chart solve over the whole patch, not a per-point formula. Cached, so repeating this
        // for every slider tweak costs a hash rather than a re-solve (see compute_patch_unwrap()).
-        const std::vector<Vec2f> lscm_uvs = (layer->projection_method == TextureProjectionMethod::LSCM) ?
+        // ModelUV takes its corners from the volume's own channel instead of solving anything, and
+        // collapses them to one per vertex the same way the unwrap does.
+        const std::vector<Vec2f> model_corner_uvs = model_uv_layer ?
+                                                        compute_model_corner_uvs(mesh, *model_uv, patch, patch_source) :
+                                                        std::vector<Vec2f>{};
+        const std::vector<Vec2f> patch_uvs = model_uv_layer ? collapse_corner_uvs(patch, model_corner_uvs) :
+                                             (layer->projection_method == TextureProjectionMethod::LSCM) ?
                                                 compute_lscm_uvs(patch, *layer) :
                                                 std::vector<Vec2f>{};
        // The colour pass below samples per *triangle*, so it takes the per-corner unwrap instead: the
        // per-vertex collapse above would hand a triangle at a seam the island layout did not join its
        // neighbour's placement, painting one triangle per face from the wrong part of the texture.
-        // (The displacement itself stays on lscm_uvs - a vertex has one position, so one height.)
-        const std::vector<Vec2f> lscm_corner_uvs = (layer->projection_method == TextureProjectionMethod::LSCM) ?
+        // (The displacement itself stays on patch_uvs - a vertex has one position, so one height.)
+        const std::vector<Vec2f> patch_corner_uvs = model_uv_layer ? model_corner_uvs :
+                                                    (layer->projection_method == TextureProjectionMethod::LSCM) ?
                                                        compute_lscm_corner_uvs(patch, *layer) :
                                                        std::vector<Vec2f>{};
-        const bool               corner_uv_ok    = !lscm_corner_uvs.empty() &&
-                                                   lscm_corner_uvs.size() == patch.indices.size() * 3;
+        const bool               corner_uv_ok     = !patch_corner_uvs.empty() &&
+                                                    patch_corner_uvs.size() == patch.indices.size() * 3;

        // Colour, if this layer carries any. Area-weighted over each base triangle's *painted* part,
        // so a triangle the brush only clipped a corner off takes the colour of that corner rather
@@ -2747,7 +2944,7 @@ static indexed_triangle_set build_texture_displacement_in_place(
                    // the per-vertex height sampling uses, evaluated at the centroid instead.
                    Vec3f n = Vec3f::Zero();
                    Vec2f uv = Vec2f::Zero();
-                    bool  have_uv = !lscm_uvs.empty();
+                    bool  have_uv = !patch_uvs.empty();
                    for (int k = 0; k < 3; ++k) {
                        const int vi = t[k];
                        if (vi < int(vertex_normals.size()))
@@ -2755,9 +2952,9 @@ static indexed_triangle_set build_texture_displacement_in_place(
                        if (!have_uv)
                            continue;
                        if (corner_uv_ok)
-                            uv += lscm_corner_uvs[j * 3 + size_t(k)];
-                        else if (size_t(vi) < lscm_uvs.size())
-                            uv += lscm_uvs[size_t(vi)];
+                            uv += patch_corner_uvs[j * 3 + size_t(k)];
+                        else if (size_t(vi) < patch_uvs.size())
+                            uv += patch_uvs[size_t(vi)];
                        else
                            have_uv = false;
                    }
@@ -2831,7 +3028,7 @@ static indexed_triangle_set build_texture_displacement_in_place(
                          [&](const tbb::blocked_range<size_t> &range) {
            for (size_t k = range.begin(); k < range.end(); ++k) {
                const size_t vi      = size_t(layer_vertices[k]);
-                const Vec2f *lscm_uv = lscm_uvs.empty() ? nullptr : &lscm_uvs[vi];
+                const Vec2f *lscm_uv = patch_uvs.empty() ? nullptr : &patch_uvs[vi];
                const float  h       = sample_layer_height(height, *layer, mesh.vertices[vi], vertex_normals[vi],
                                                            patch_centroid, patch_axis, lscm_uv);
                // midlevel is the height that means "stay put", so anything below it displaces
@@ -2964,7 +3161,8 @@ indexed_triangle_set build_texture_displacement(const indexed_triangle_set
                                                 const TextureColorRequest                   *color,
                                                 const Transform3d                           &volume_to_world,
                                                 BakeStageRecorder                           *debug,
-                                                 TextureBakeStats                            *stats)
+                                                 TextureBakeStats                            *stats,
+                                                 const std::vector<Vec2f>                    *model_uv)
 {
    // An untransformed volume on an untransformed instance is by far the common case, and the round
    // trip costs two matrix multiplies per vertex on a mesh that can carry millions of them - so take
@@ -2974,7 +3172,7 @@ indexed_triangle_set build_texture_displacement(const indexed_triangle_set
    const Transform3d frame = texture_displacement_bake_frame(volume_to_world);
    if (frame.matrix().isApprox(Transform3d::Identity().matrix()))
        return build_texture_displacement_in_place(base_mesh, layers, facets_data, options, progress, color,
-                                                   false, debug, stats);
+                                                   false, debug, stats, model_uv);

    const Transform3d to_local = frame.inverse();
    // A mirroring placement leaves the positions correct but every winding-derived normal pointing
@@ -2988,8 +3186,10 @@ indexed_triangle_set build_texture_displacement(const indexed_triangle_set
        v = (frame * v.cast<double>()).cast<float>();

    const size_t         debug_mark = (debug != nullptr) ? debug->mark() : 0;
+    // The UV channel rides along untouched: a uv is a coordinate in the texture, not on the model, so
+    // the frame the mesh is measured in does not reach it.
    indexed_triangle_set out = build_texture_displacement_in_place(world, layers, facets_data, options,
-                                                                   progress, color, mirrored, debug, stats);
+                                                                   progress, color, mirrored, debug, stats, model_uv);
    // Everything the bake recorded is in world millimetres, like `out` itself. The debug view draws in
    // the volume's local frame, so the stages are brought back the same way the result is.
    if (debug != nullptr)
@@ -3061,7 +3261,8 @@ indexed_triangle_set build_texture_displacement(const ModelVolume &volume)

    return build_texture_displacement(volume.mesh().its, volume.texture_displacement_layers, facets_data,
                                      volume.texture_displacement_options, {}, nullptr,
-                                      texture_displacement_volume_to_world(volume));
+                                      texture_displacement_volume_to_world(volume), nullptr, nullptr,
+                                      volume.has_texture_uv() ? &volume.texture_uv : nullptr);
 }

 void smooth_mesh_vertices(indexed_triangle_set &mesh, const std::vector<uint8_t> &movable, float strength,
@@ -3125,16 +3326,18 @@ void smooth_mesh_vertices(indexed_triangle_set &mesh, const std::vector<uint8_t>
 namespace {
 // One decoded texture + placement per sampleable layer, in blend (slot) order. Held by shared_ptr so
 // the returned closure owns it for as long as the subdivider keeps calling back.
-// An unwrap turned into something a *point* sampler can use. LSCM has no formula from position to
-// uv - it is a per-triangle map - so a point is placed on the painted patch (the nearest patch
-// triangle, and its barycentric coordinates there) and the uv is interpolated from that triangle's own
-// per-corner uvs. Exact for a point on the base surface, which is where both samplers are queried: the
-// displacement samples refined positions before moving them, and the colour pass samples the foot
-// point on the painted pieces.
+// A per-triangle uv map turned into something a *point* sampler can use. Neither of the two maps that
+// are not a formula from position to uv - the LSCM unwrap and the model's own UV channel - can be
+// evaluated at an arbitrary point directly, so a point is placed on the painted patch (the nearest
+// patch triangle, and its barycentric coordinates there) and the uv is interpolated from that
+// triangle's own per-corner uvs. Exact for a point on the base surface, which is where both samplers
+// are queried: the displacement samples refined positions before moving them, and the colour pass
+// samples the foot point on the painted pieces.
 struct LscmLookup {
-    indexed_triangle_set    patch;  // the layer's painted patch, as the unwrap was solved on
+    indexed_triangle_set    patch;  // the layer's painted patch, as the uvs were computed on
    AABBTreeIndirect::Tree3f tree;
-    std::vector<Vec2f>      corner; // compute_lscm_corner_uvs(patch, layer)
+    // compute_lscm_corner_uvs(patch, layer), or compute_model_corner_uvs() for a ModelUV layer
+    std::vector<Vec2f>      corner;

    // False when `pos` is not on this layer's patch (farther than `tol`): there is no uv there, so the
    // layer contributes nothing - the same as a non-tiled texture outside its placement.
@@ -3147,15 +3350,9 @@ struct LscmLookup {
        if (d2 < 0.f || d2 > tol * tol || hit >= patch.indices.size())
            return false;
        const stl_triangle_vertex_indices &t = patch.indices[hit];
-        const Vec3f &a = patch.vertices[size_t(t[0])], &b = patch.vertices[size_t(t[1])], &c = patch.vertices[size_t(t[2])];
-        const Vec3f  e0 = b - a, e1 = c - a, ep = foot - a;
-        const float  d00 = e0.dot(e0), d01 = e0.dot(e1), d11 = e1.dot(e1), dp0 = ep.dot(e0), dp1 = ep.dot(e1);
-        const float  den = d00 * d11 - d01 * d01;
-        float        w1 = 1.f / 3.f, w2 = 1.f / 3.f; // a degenerate triangle takes its centroid's uv
-        if (std::abs(den) > 1e-20f) {
-            w1 = (d11 * dp0 - d01 * dp1) / den;
-            w2 = (d00 * dp1 - d01 * dp0) / den;
-        }
+        float w1 = 0.f, w2 = 0.f; // a degenerate triangle takes its centroid's uv
+        barycentric_weights(patch.vertices[size_t(t[0])], patch.vertices[size_t(t[1])], patch.vertices[size_t(t[2])],
+                            foot, w1, w2);
        const Vec2f *c3 = &corner[hit * 3];
        uv = (1.f - w1 - w2) * c3[0] + w1 * c3[1] + w2 * c3[2];
        return true;
@@ -3214,7 +3411,7 @@ struct PreparedLayer {
 // where a layer is placed. `need_color` additionally drops layers that cannot contribute colour.
 std::shared_ptr<std::vector<PreparedLayer>> prepare_sampleable_layers(
    const indexed_triangle_set &base_mesh, const std::vector<TextureDisplacementLayer> &layers,
-    const TextureDisplacementFacetsData &facets_data, bool need_color)
+    const TextureDisplacementFacetsData &facets_data, bool need_color, const std::vector<Vec2f> *model_uv)
 {
    auto prepared = std::make_shared<std::vector<PreparedLayer>>();

@@ -3245,9 +3442,14 @@ std::shared_ptr<std::vector<PreparedLayer>> prepare_sampleable_layers(
        if (tex.empty() || (need_color && !tex.has_color()))
            continue;

+        const bool model_uv_layer = layer->projection_method == TextureProjectionMethod::ModelUV &&
+                                    model_uv != nullptr && model_uv->size() == base_mesh.indices.size() * 3;
+
        TriangleSelector selector(selector_mesh);
        selector.deserialize(data, false);
-        const indexed_triangle_set patch = selector.get_facets_strict(EnforcerBlockerType::ENFORCER);
+        std::vector<int>           patch_source; // only the model's own channel needs it; see the classic path
+        const indexed_triangle_set patch =
+            selector.get_facets_strict(EnforcerBlockerType::ENFORCER, model_uv_layer ? &patch_source : nullptr);
        if (patch.indices.empty())
            continue;

@@ -3257,12 +3459,16 @@ std::shared_ptr<std::vector<PreparedLayer>> prepare_sampleable_layers(
        texture_displacement_patch_frame(patch, vertex_normals, centroid, axis, average_normal);

        std::shared_ptr<const LscmLookup> lscm;
-        if (layer->projection_method == TextureProjectionMethod::LSCM) {
+        if (model_uv_layer || layer->projection_method == TextureProjectionMethod::LSCM) {
            // Solved on the very patch the classic path and the GUI solve it on (same geometry, seam
            // angle and edges), so it hits the unwrap cache and lands exactly where the UV editor
-            // shows it, hand-placed islands and UV edits included.
+            // shows it, hand-placed islands and UV edits included. A ModelUV layer needs no solve at
+            // all - its corners are read straight out of the volume's channel - but it is looked up
+            // through the same per-triangle machinery, for the same reason: there is no formula from a
+            // point to its uv.
            auto l    = std::make_shared<LscmLookup>();
-            l->corner = compute_lscm_corner_uvs(patch, *layer);
+            l->corner = model_uv_layer ? compute_model_corner_uvs(base_mesh, *model_uv, patch, patch_source) :
+                                          compute_lscm_corner_uvs(patch, *layer);
            if (l->corner.size() == patch.indices.size() * 3) {
                l->patch = patch;
                l->tree  = AABBTreeIndirect::build_aabb_tree_over_indexed_triangle_set(l->patch.vertices, l->patch.indices);
@@ -3288,11 +3494,12 @@ ColorFieldSampler make_combined_color_sampler(const indexed_triangle_set
                                              const std::vector<TextureDisplacementLayer> &layers,
                                              const TextureDisplacementFacetsData         &facets_data,
                                              ColorQuantizeFn                              quantize,
-                                              ColorQuantizeFn                              quantize_pure)
+                                              ColorQuantizeFn                              quantize_pure,
+                                              const std::vector<Vec2f>                    *model_uv)
 {
    if (!quantize)
        return nullptr;
-    auto prepared = prepare_sampleable_layers(base_mesh, layers, facets_data, /* need_color */ true);
+    auto prepared = prepare_sampleable_layers(base_mesh, layers, facets_data, /* need_color */ true, model_uv);
    if (prepared->empty())
        return nullptr;
    // Per layer: a flat-colour image is matched against the filaments alone, when that quantizer
@@ -3323,9 +3530,10 @@ ColorFieldSampler make_combined_color_sampler(const indexed_triangle_set

 HeightFieldSampler make_combined_displacement_sampler(const indexed_triangle_set                  &base_mesh,
                                                      const std::vector<TextureDisplacementLayer> &layers,
-                                                      const TextureDisplacementFacetsData         &facets_data)
+                                                      const TextureDisplacementFacetsData         &facets_data,
+                                                      const std::vector<Vec2f>                    *model_uv)
 {
-    auto prepared = prepare_sampleable_layers(base_mesh, layers, facets_data, /* need_color */ false);
+    auto prepared = prepare_sampleable_layers(base_mesh, layers, facets_data, /* need_color */ false, model_uv);
    if (prepared->empty())
        return nullptr;

@@ -5166,5 +5374,260 @@ indexed_triangle_set cut_mesh_at_steps(const indexed_triangle_set &mesh, const s
    return out;
 }

+// ---------------------------------------------------------------------------------------------
+// Project persistence. See the declarations in TextureDisplacement.hpp for why this is JSON rather
+// than the cereal stream next to them.
+// ---------------------------------------------------------------------------------------------
+namespace {
+
+nlohmann::json vec2_to_json(const Vec2f &v) { return nlohmann::json::array({ v.x(), v.y() }); }
+nlohmann::json vec3_to_json(const Vec3f &v) { return nlohmann::json::array({ v.x(), v.y(), v.z() }); }
+
+Vec2f vec2_from_json(const nlohmann::json &j, const Vec2f &fallback)
+{
+    if (!j.is_array() || j.size() != 2)
+        return fallback;
+    return Vec2f(j[0].get<float>(), j[1].get<float>());
+}
+Vec3f vec3_from_json(const nlohmann::json &j, const Vec3f &fallback)
+{
+    if (!j.is_array() || j.size() != 3)
+        return fallback;
+    return Vec3f(j[0].get<float>(), j[1].get<float>(), j[2].get<float>());
+}
+
+// Reads key `k` into `out` when it is present and of the expected type, leaving `out` alone otherwise.
+// That "leave it alone" is the whole point: every member starts at its struct default, so a project
+// written by an older build simply keeps the defaults for whatever it did not know about.
+template<class T> void read(const nlohmann::json &j, const char *k, T &out)
+{
+    const auto it = j.find(k);
+    if (it == j.end())
+        return;
+    try {
+        out = it->get<T>();
+    } catch (...) {
+    }
+}
+void read_enum(const nlohmann::json &j, const char *k, int &out)
+{
+    const auto it = j.find(k);
+    if (it != j.end() && it->is_number_integer())
+        out = it->get<int>();
+}
+
+} // namespace
+
+std::string texture_displacement_layers_to_json(const std::vector<TextureDisplacementLayer> &layers,
+                                                const TextureDisplacementOptions            &options)
+{
+    nlohmann::json root;
+    root["version"] = 1;
+
+    nlohmann::json &opt = root["options"];
+    opt["displace_border"]    = options.displace_border;
+    opt["smooth_enabled"]     = options.smooth_enabled;
+    opt["smooth_strength"]    = options.smooth_strength;
+    opt["smooth_iterations"]  = options.smooth_iterations;
+    opt["smooth_skip_border"] = options.smooth_skip_border;
+    opt["pipeline_v2"]        = options.pipeline_v2;
+    opt["v2_refine_mm"]       = options.v2_refine_mm;
+    opt["v2_regularize"]      = options.v2_regularize;
+    opt["v2_max_triangles_k"] = options.v2_max_triangles_k;
+    opt["v2_relocate"]        = options.v2_relocate;
+    opt["v2_flip_edges"]      = options.v2_flip_edges;
+    opt["color_mix_enabled"]  = options.color_mix_enabled;
+    opt["color_despeckle"]    = options.color_despeckle;
+    opt["color_mix_count"]    = options.color_mix_count;
+    opt["active_slot"]        = options.active_slot;
+    opt["panel_mode"]         = options.panel_mode;
+
+    nlohmann::json &arr = root["layers"];
+    arr                 = nlohmann::json::array();
+    for (const TextureDisplacementLayer &l : layers) {
+        nlohmann::json j;
+        j["slot"]        = l.slot;
+        j["name"]        = l.name;
+        j["path"]        = l.path;
+        j["path_in_3mf"] = l.path_in_3mf;
+
+        j["depth_mm"]     = l.depth_mm;
+        j["tiling_scale"] = l.tiling_scale;
+        j["rotation_deg"] = l.rotation_deg;
+        j["offset"]       = vec2_to_json(l.offset);
+        j["invert"]       = l.invert;
+        j["midlevel"]     = l.midlevel;
+        j["smoothing"]    = l.smoothing;
+
+        j["edge_smoothing"]        = l.edge_smoothing;
+        j["edge_smoothing_amount"] = l.edge_smoothing_amount;
+        j["auto_connect_islands"]  = l.auto_connect_islands;
+
+        j["tile_enabled"]      = l.tile_enabled;
+        j["tile_method"]       = int(l.tile_method);
+        j["projection_method"] = int(l.projection_method);
+        j["blend_mode"]        = int(l.blend_mode);
+        j["color_enabled"]     = l.color_enabled;
+
+        j["lscm_seam_angle_deg"] = l.lscm_seam_angle_deg;
+        j["island_padding_mm"]   = l.island_padding_mm;
+
+        j["view_project_right"]      = vec3_to_json(l.view_project_right);
+        j["view_project_up"]         = vec3_to_json(l.view_project_up);
+        j["view_project_projective"] = l.view_project_projective;
+        j["view_project_matrix"]     = l.view_project_matrix;
+
+        // Flat pairs rather than nested arrays: shorter, and the reader can simply ignore a trailing
+        // odd element instead of having to validate every sub-array.
+        nlohmann::json &seams = j["lscm_seam_edges"];
+        seams                 = nlohmann::json::array();
+        for (const auto &[a, b] : l.lscm_seam_edges) {
+            seams.push_back(a);
+            seams.push_back(b);
+        }
+
+        nlohmann::json &islands = j["islands"];
+        islands                 = nlohmann::json::array();
+        for (const TextureIsland &island : l.islands)
+            islands.push_back(nlohmann::json::array(
+                { island.offset.x(), island.offset.y(), island.rotation_deg, island.scale }));
+
+        j["island_groups"] = l.island_groups;
+
+        nlohmann::json &overrides = j["lscm_uv_overrides"];
+        overrides                 = nlohmann::json::array();
+        for (const auto &[key, uv] : l.lscm_uv_overrides)
+            overrides.push_back(nlohmann::json::array({ key, uv.x(), uv.y() }));
+
+        arr.push_back(std::move(j));
+    }
+    return root.dump();
+}
+
+bool texture_displacement_layers_from_json(const std::string                     &text,
+                                           std::vector<TextureDisplacementLayer> &layers,
+                                           TextureDisplacementOptions            &options)
+{
+    nlohmann::json root;
+    try {
+        root = nlohmann::json::parse(text);
+    } catch (...) {
+        return false;
+    }
+    if (!root.is_object())
+        return false;
+
+    TextureDisplacementOptions out_options;
+    if (const auto it = root.find("options"); it != root.end() && it->is_object()) {
+        const nlohmann::json &opt = *it;
+        read(opt, "displace_border", out_options.displace_border);
+        read(opt, "smooth_enabled", out_options.smooth_enabled);
+        read(opt, "smooth_strength", out_options.smooth_strength);
+        read(opt, "smooth_iterations", out_options.smooth_iterations);
+        read(opt, "smooth_skip_border", out_options.smooth_skip_border);
+        read(opt, "pipeline_v2", out_options.pipeline_v2);
+        read(opt, "v2_refine_mm", out_options.v2_refine_mm);
+        read(opt, "v2_regularize", out_options.v2_regularize);
+        read(opt, "v2_max_triangles_k", out_options.v2_max_triangles_k);
+        read(opt, "v2_relocate", out_options.v2_relocate);
+        read(opt, "v2_flip_edges", out_options.v2_flip_edges);
+        read(opt, "color_mix_enabled", out_options.color_mix_enabled);
+        read(opt, "color_despeckle", out_options.color_despeckle);
+        read(opt, "color_mix_count", out_options.color_mix_count);
+        read(opt, "active_slot", out_options.active_slot);
+        read(opt, "panel_mode", out_options.panel_mode);
+        out_options.active_slot = std::clamp(out_options.active_slot, 0, int(TEXTURE_DISPLACEMENT_MAX_LAYERS) - 1);
+        out_options.panel_mode  = std::clamp(out_options.panel_mode, 0, 1);
+    }
+
+    std::vector<TextureDisplacementLayer> out_layers;
+    // read() skips a value of the wrong type, but the vector, matrix, seam, island and UV-override arrays
+    // below read their numbers with get<>(), which throws on one; that rejects the document, like text that
+    // does not parse.
+    try {
+        if (const auto it = root.find("layers"); it != root.end() && it->is_array()) {
+            for (const nlohmann::json &j : *it) {
+                if (!j.is_object())
+                    continue;
+                TextureDisplacementLayer l;
+                read(j, "slot", l.slot);
+                // The panel and the paint masks are indexed by slot, so a layer without a valid one rejects the
+                // document rather than reaching them.
+                if (l.slot < 0 || l.slot >= int(TEXTURE_DISPLACEMENT_MAX_LAYERS))
+                    return false;
+                read(j, "name", l.name);
+                read(j, "path", l.path);
+                read(j, "path_in_3mf", l.path_in_3mf);
+
+                read(j, "depth_mm", l.depth_mm);
+                read(j, "tiling_scale", l.tiling_scale);
+                read(j, "rotation_deg", l.rotation_deg);
+                if (const auto o = j.find("offset"); o != j.end())
+                    l.offset = vec2_from_json(*o, l.offset);
+                read(j, "invert", l.invert);
+                read(j, "midlevel", l.midlevel);
+                read(j, "smoothing", l.smoothing);
+
+                read(j, "edge_smoothing", l.edge_smoothing);
+                read(j, "edge_smoothing_amount", l.edge_smoothing_amount);
+                read(j, "auto_connect_islands", l.auto_connect_islands);
+
+                read(j, "tile_enabled", l.tile_enabled);
+                read(j, "color_enabled", l.color_enabled);
+                int tile_method = int(l.tile_method), projection = int(l.projection_method), blend = int(l.blend_mode);
+                read_enum(j, "tile_method", tile_method);
+                read_enum(j, "projection_method", projection);
+                read_enum(j, "blend_mode", blend);
+                l.tile_method       = TextureTileMethod(tile_method);
+                l.projection_method = TextureProjectionMethod(std::clamp(projection, 0, 4));
+                l.blend_mode        = TextureBlendMode(blend);
+
+                read(j, "lscm_seam_angle_deg", l.lscm_seam_angle_deg);
+                read(j, "island_padding_mm", l.island_padding_mm);
+
+                if (const auto v = j.find("view_project_right"); v != j.end())
+                    l.view_project_right = vec3_from_json(*v, l.view_project_right);
+                if (const auto v = j.find("view_project_up"); v != j.end())
+                    l.view_project_up = vec3_from_json(*v, l.view_project_up);
+                read(j, "view_project_projective", l.view_project_projective);
+                if (const auto v = j.find("view_project_matrix"); v != j.end() && v->is_array() && v->size() == 12)
+                    for (size_t i = 0; i < 12; ++i)
+                        l.view_project_matrix[i] = (*v)[i].get<float>();
+
+                if (const auto v = j.find("lscm_seam_edges"); v != j.end() && v->is_array())
+                    for (size_t i = 0; i + 1 < v->size(); i += 2)
+                        l.lscm_seam_edges.emplace_back((*v)[i].get<int>(), (*v)[i + 1].get<int>());
+
+                if (const auto v = j.find("islands"); v != j.end() && v->is_array())
+                    for (const nlohmann::json &e : *v) {
+                        if (!e.is_array() || e.size() != 4)
+                            continue;
+                        TextureIsland island;
+                        island.offset       = Vec2f(e[0].get<float>(), e[1].get<float>());
+                        island.rotation_deg = e[2].get<float>();
+                        island.scale        = e[3].get<float>();
+                        l.islands.push_back(island);
+                    }
+
+                read(j, "island_groups", l.island_groups);
+
+                if (const auto v = j.find("lscm_uv_overrides"); v != j.end() && v->is_array())
+                    for (const nlohmann::json &e : *v) {
+                        if (!e.is_array() || e.size() != 3)
+                            continue;
+                        l.lscm_uv_overrides.emplace_back(e[0].get<int>(), Vec2f(e[1].get<float>(), e[2].get<float>()));
+                    }
+
+                out_layers.push_back(std::move(l));
+            }
+        }
+    } catch (const nlohmann::json::exception &) {
+        return false;
+    }
+
+    layers  = std::move(out_layers);
+    options = out_options;
+    return true;
+}

 } // namespace Slic3r
@@ -86,6 +86,17 @@ enum class TextureProjectionMethod : int
    // that is inherent to view projection and is the user's call, not a bug. The projector's two
    // in-plane axes live in TextureDisplacementLayer::view_project_right/up.
    ViewProjected = 4,
+    // The model's own texture coordinates, as the file it was imported from carried them (see
+    // ModelVolume::texture_uv). Nothing is unwrapped or projected: the artist's layout *is* the
+    // placement, so a texture authored against that layout - the model's own albedo map, say - lands
+    // exactly where it was painted. Automatically picked for a new layer on a volume that has a UV
+    // channel, since re-unwrapping a model that already carries one can only be worse than using it.
+    //
+    // The uv is already normalized, so unlike every method above it is not measured in millimetres:
+    // "Tile size" and the non-square aspect correction do not apply to it (the layer's rotation and
+    // offset still do). Falls back to Triplanar when the volume has no channel, exactly as LSCM falls
+    // back when a patch cannot be flattened.
+    ModelUV       = 5,
 };

 // Dihedral angle (degrees) above which an edge between two painted triangles becomes a chart seam
@@ -121,6 +132,11 @@ enum class TextureBlendMode : int
    Subtract = 1, // acc - value          (carve this layer's relief out of the layers below)
    Multiply = 2, // acc * (value / 1mm)  (mask/modulate the layers below by this layer)
    Divide   = 3, // acc / (value / 1mm)  (inverse mask; guarded against a zero/near-zero divisor)
+    // acc = value: this layer replaces what is under it instead of combining with it, so where it is
+    // painted only its own relief remains. The image editor's "Normal" mode, under the name the panel
+    // uses. Note the stack's *colour* already behaves this way - a higher slot's colour overwrites a
+    // lower one's where they overlap - so this is what makes the displacement agree with it.
+    Override = 4,
 };

 // Combines one layer's signed displacement `value` (mm) into `accumulated` (mm) per `mode`.
@@ -397,14 +413,41 @@ struct TextureDisplacementOptions
    // finer than the mesh leaves behind, without eating features that are genuinely a facet wide.
    int          color_despeckle   = 2;

+    // Where the panel was left, rather than anything the bake reads. It lives with the volume because
+    // that is what it describes: reopening a project should put the user back on the layer they were
+    // editing, in the mode they were editing it in, not on slot 0 in Standard.
+    int active_slot = 0;
+    int panel_mode  = 0; // 0 Standard, 1 Pro
+
    template<class Archive> void serialize(Archive &ar)
    {
        ar(displace_border, smooth_enabled, smooth_strength, smooth_iterations, smooth_skip_border,
           pipeline_v2, v2_refine_mm, v2_regularize, v2_max_triangles_k,
-           v2_relocate, color_mix_enabled, color_despeckle, color_mix_count);
+           v2_relocate, v2_flip_edges, color_mix_enabled, color_despeckle, color_mix_count,
+           active_slot, panel_mode);
    }
 };

+// Project persistence (see bbs_3mf.cpp). The layer stack and the per-volume options are written to the
+// .3mf as JSON rather than through the cereal save()/load() above: those two are positional and
+// unversioned, which is right for the undo/redo stack they serve (one session, one binary) but would
+// make every future field a project-breaking change. A JSON object tolerates both directions - an
+// unknown key is ignored, a missing one keeps the member's default - so old projects keep loading and
+// new ones degrade gracefully in older builds.
+//
+// The texture image itself is *not* in here. It is a binary blob that belongs in the archive as a file
+// of its own, exactly as EmbossShape stores its SVG; `path_in_3mf` names that file, and the caller is
+// responsible for writing it and for filling `image_data` back in on load.
+std::string texture_displacement_layers_to_json(const std::vector<TextureDisplacementLayer> &layers,
+                                                const TextureDisplacementOptions            &options);
+// Returns false and leaves both outputs untouched when the text is not a valid JSON object, a number in a
+// layer's vector, matrix, seam, island or UV-override array has the wrong type, or a layer's slot is
+// missing or outside [0, TEXTURE_DISPLACEMENT_MAX_LAYERS). Any other value of the wrong type or shape
+// keeps its default.
+bool texture_displacement_layers_from_json(const std::string                      &text,
+                                           std::vector<TextureDisplacementLayer>  &layers,
+                                           TextureDisplacementOptions             &options);
+
 // How much detail a height texture carries: central differences of the grey image, the mean gradient
 // and the share of texels steeper than 30 grey levels, mapped to how many texels one mesh edge may
 // span (1 for a hard-edged image, 4 for a smooth one). Cached per image, like the decode.
@@ -541,7 +584,13 @@ Vec2f project_planar(const Vec3f &position, const Vec3f &normal);
 // squeezed into a square tile: `tiling_scale` is the tile's size along u, and the tile is
 // `tiling_scale * height / width` mm along v, which keeps texels square. 1 (the default) is the
 // square case and leaves the coordinate exactly as it always was.
-Vec2f apply_uv_transform(const Vec2f &planar, const TextureDisplacementLayer &layer, float aspect = 1.f);
+//
+// `normalized_uv` says the coordinate is already a uv rather than a millimetre measurement on the
+// model - which is what TextureProjectionMethod::ModelUV hands in. Then neither the tiling scale (mm
+// per tile is meaningless for it) nor the aspect correction (the artist's layout already accounts for
+// the image's proportions) applies, and only the rotation and offset are left.
+Vec2f apply_uv_transform(const Vec2f &planar, const TextureDisplacementLayer &layer, float aspect = 1.f,
+                         bool normalized_uv = false);

 // Applies a row-major 3x4 projective matrix (see TextureDisplacementLayer::view_project_matrix) to a
 // local-space point, writing the resulting texture uv. Returns false - and leaves `uv` untouched -
@@ -578,6 +627,31 @@ bool sample_layer_color(const DecodedHeightTexture &texture, const TextureDispla
                        const Vec3f &patch_center = Vec3f::Zero(), const Vec3f &patch_axis = Vec3f::UnitZ(),
                        const Vec2f *lscm_uv = nullptr);

+// Carries a per-facet paint annotation - the colour paint above all - from a mesh onto the mesh a
+// bake produced from it: every triangle of `dst_mesh` takes the state painted at its own foot point on
+// `src_mesh`, i.e. on the nearest point of the surface it was built from. Returned as one
+// EnforcerBlockerType per `dst_mesh` triangle, 0 (NONE) where that foot point carried no paint.
+//
+// ModelVolume::restore_painting() cannot do this. Its remap pairs a source paint triangle with a
+// target triangle that *overlaps* it to within 0.01 mm, which is right for a remesh or a
+// simplification - they leave the surface where it was - and useless after a bake, which moves the
+// surface by the relief depth. Measured on a model displaced by a tenth of its own size, that remap
+// kept a quarter of the colour and left the rest unpainted; this keeps essentially all of it, because
+// a foot point is exactly as far away as the relief is deep and the lookup does not care how far that
+// is.
+//
+// The source's *sub*-triangles are what is looked up, not its triangles, so the part of a triangle a
+// brush stroke only clipped a corner off keeps its own state rather than rounding to the whole
+// triangle's. No distance limit is needed or wanted: the nearest point on the source surface is where
+// a baked triangle came from however far the relief carried it, and an unpainted origin reports NONE
+// on its own.
+//
+// Returns an empty vector when `src_paint` is empty or either mesh is - the caller then has nothing to
+// carry, which is not the same as "carry nothing".
+std::vector<uint8_t> transfer_facet_paint(const indexed_triangle_set                    &src_mesh,
+                                         const TriangleSelector::TriangleSplittingData &src_paint,
+                                         const indexed_triangle_set                    &dst_mesh);
+
 // Area-weighted centroid and average normal of a layer's currently painted patch, in mesh-local
 // coordinates - the same measurements build_texture_displacement() uses to pick its dominant
 // projection axis. Used by the GUI to anchor the on-canvas "adjust texture placement" gizmo to
@@ -691,6 +765,55 @@ std::vector<Vec2f> compute_lscm_uvs(const indexed_triangle_set &patch, const Tex
 // Returns an empty vector if the patch has no triangles or the unwrap carries no source_face map.
 std::vector<Vec2f> compute_lscm_corner_uvs(const indexed_triangle_set &patch, const TextureDisplacementLayer &layer);

+// Three UVs per patch triangle, read out of the model's *own* UV channel - the
+// TextureProjectionMethod::ModelUV counterpart of compute_lscm_corner_uvs(), and laid out the same way
+// (corner k of triangle i at index 3i+k).
+//
+// `model_uv` is the volume's channel: three uvs per triangle of `base_mesh`, in its triangle order
+// (see ModelVolume::texture_uv). `patch_source` maps each patch triangle back to the base-mesh
+// triangle it was cut from - TriangleSelector::get_facets_strict()'s out_source. A patch triangle is
+// always a piece of exactly one base triangle, so each of its corners is interpolated barycentrically
+// inside that triangle's three uvs. That is what keeps a sub-triangle the brush split (whose corners
+// are not base-mesh vertices at all) on the texture, and what keeps the two sides of a UV seam
+// reading from their own island instead of from one averaged coordinate.
+//
+// Returns an empty vector when the channel does not match `base_mesh`, when `patch_source` does not
+// match `patch`, or when either is empty - the callers treat that as "no placement" and fall back,
+// exactly as they do for an unwrap that failed.
+std::vector<Vec2f> compute_model_corner_uvs(const indexed_triangle_set &base_mesh,
+                                            const std::vector<Vec2f>   &model_uv,
+                                            const indexed_triangle_set &patch,
+                                            const std::vector<int>     &patch_source);
+
+// One UV per patch vertex, collapsed from a per-corner array: the first corner to reach a vertex wins.
+// This is the per-corner/per-vertex split compute_lscm_uvs() documents, applied to any corner array -
+// displacement is per-vertex, so a vertex on a seam has to settle on one of its copies.
+// Returns an empty vector if `corner` is not three per patch triangle.
+std::vector<Vec2f> collapse_corner_uvs(const indexed_triangle_set &patch, const std::vector<Vec2f> &corner);
+
+// Resamples a per-corner UV channel from `src_mesh` onto `dst_mesh`, for when something replaces a
+// volume's mesh and the model's own UV channel has to come along: the colour import's painted mesh,
+// the gizmo's remesh/subdivide, the default bake pipeline's rebuild. Each destination corner takes the
+// uv of its closest point on the source surface, interpolated barycentrically inside the source
+// triangle it lands on - the same transfer LscmLookup does per point, run over every corner.
+//
+// Exact wherever the two meshes describe the same surface, which is the case for every caller here
+// (they subdivide, repair or displace it, they do not reshape it). A corner that lands nowhere near
+// the source - farther than `max_distance` (negative: no limit) - takes (0, 0).
+//
+// One thing a positional transfer cannot reproduce: a *seam* vertex, where one position carries a
+// different uv in each island that meets there. Position alone does not say which island a corner
+// belongs to, so corners on a seam all take whichever island the nearest-triangle lookup lands on,
+// and the texture can be off by up to one triangle in a band along the island borders. Doing better
+// needs a triangle-to-triangle correspondence, which only some of the stages that replace a mesh
+// have (a remesh has none at all).
+//
+// Returns an empty vector when `src_uv` is not three per source triangle, or when either mesh is empty.
+std::vector<Vec2f> transfer_uv_channel(const indexed_triangle_set &src_mesh,
+                                       const std::vector<Vec2f>   &src_uv,
+                                       const indexed_triangle_set &dst_mesh,
+                                       float                       max_distance = -1.f);
+
 // The TextureDisplacementLayer::lscm_uv_overrides key for one unwrapped vertex (an index into PatchUnwrap::uvs).
 inline int lscm_uv_override_key(int unwrapped_vertex) { return -(unwrapped_vertex + 1); }

@@ -749,6 +872,10 @@ using TextureDisplacementFacetsData = std::array<TriangleSelector::TriangleSplit
 //
 // `color`, when given, also reports which filament each triangle should print in - see
 // TextureColorRequest.
+//
+// `model_uv`, when given, is the volume's own UV channel (three uvs per base-mesh triangle, see
+// ModelVolume::texture_uv) and is what a TextureProjectionMethod::ModelUV layer maps through. A layer
+// set to ModelUV without it falls back to Triplanar.
 struct TextureColorRequest
 {
    // RGB -> palette index. Supplied by the GUI, which owns both the perceptual matching and the list
@@ -823,7 +950,9 @@ indexed_triangle_set build_texture_displacement(const indexed_triangle_set
                                                 // stage, already brought back into `base_mesh`'s frame.
                                                 BakeStageRecorder                           *debug = nullptr,
                                                 // When given, receives what the bake spent.
-                                                 TextureBakeStats                            *stats = nullptr);
+                                                 TextureBakeStats                            *stats = nullptr,
+                                                 // The model's own UV channel; see above.
+                                                 const std::vector<Vec2f>                    *model_uv = nullptr);

 // `volume`'s mesh coordinates -> world millimetres: its first instance's transform times its own.
 // The mesh is shared by every instance, so a multi-instance object can only be baked for one of
@@ -898,11 +1027,15 @@ ColorFieldSampler make_combined_color_sampler(const indexed_triangle_set
                                              const std::vector<TextureDisplacementLayer> &layers,
                                              const TextureDisplacementFacetsData         &facets_data,
                                              ColorQuantizeFn                              quantize,
-                                              ColorQuantizeFn                              quantize_pure = nullptr);
+                                              ColorQuantizeFn                              quantize_pure = nullptr,
+                                              // The model's own UV channel, for ModelUV layers; see
+                                              // build_texture_displacement().
+                                              const std::vector<Vec2f>                    *model_uv = nullptr);

 HeightFieldSampler make_combined_displacement_sampler(const indexed_triangle_set                  &base_mesh,
                                                      const std::vector<TextureDisplacementLayer> &layers,
-                                                      const TextureDisplacementFacetsData         &facets_data);
+                                                      const TextureDisplacementFacetsData         &facets_data,
+                                                      const std::vector<Vec2f>                    *model_uv = nullptr);

 // Uniformly subdivides `mesh` (every triangle recursively split into 4 via edge midpoints, using a
 // shared cache so a midpoint is computed once and reused by both triangles on either side of that
@@ -1107,6 +1240,10 @@ struct TextureDisplacementPrepareResult
 {
    indexed_triangle_set          mesh;
    TextureDisplacementFacetsData masks;
+    // The model's own UV channel, resampled onto `mesh` (see transfer_uv_channel()). Empty when the
+    // volume had none. Like the masks it is handed back rather than left to the caller to recompute,
+    // because only the run itself knows which stages replaced the mesh.
+    std::vector<Vec2f>            uv;
    // The remesh landed but no layer's paint survived being carried onto it. Nothing is committed:
    // everything downstream is driven by that paint, so baking on would bake a flat mesh.
    bool                          paint_lost = false;
@@ -25,6 +25,7 @@
 #include "TextureToColor/ColorUtils.hpp"

 #include "Model.hpp"
+#include "TextureDisplacement.hpp"
 #include "TextureToColor/TriMesh.hpp"
 #include "TriangleMesh.hpp"
 #include "TriangleSelector.hpp"
@@ -554,9 +555,29 @@ bool apply_painted_mesh_to_volume(
                << ", unit_scale=" << unit_scale << ")";
    }

+    // The model's own UV channel is indexed by triangle, and this replaces the triangles, so it has
+    // to be resampled onto them. Kept rather than dropped because it is the layout the model was
+    // authored against: a texture-displacement layer set to ModelUV maps through it, and the colour
+    // import is exactly the path a model that carries one arrives by.
+    const indexed_triangle_set old_its = volume.has_texture_uv() ? volume.mesh().its : indexed_triangle_set{};
+    const std::vector<Vec2f>   old_uv  = volume.texture_uv;
+
    volume.set_mesh(std::move(new_mesh));
    volume.calculate_convex_hull();

+    // Resampled here and not further down, while the two meshes still share a frame: the painted mesh
+    // was just shifted by the same source.mesh_offset the old one was centred by, so the only thing
+    // between them is whatever drift the repair introduced. The re-centering below translates the mesh
+    // again, and a translation is exactly what a closest-point transfer cannot see through - it would
+    // read every uv off a point that far away. A uv is a coordinate in the texture, so it does not care
+    // about either shift; it just has to be read before the second one happens.
+    if (!old_its.indices.empty())
+        volume.texture_uv = transfer_uv_channel(old_its, old_uv, volume.mesh().its);
+    else
+        // No channel to carry, so make sure none is left behind either: a leftover of the right length
+        // would read as a valid channel against a mesh it was never measured on.
+        volume.reset_texture_uv();
+
    // Re-center the replaced mesh so its bbox center sits at the origin,
    // matching what center_geometry_after_creation did for the original mesh.
    // CGAL repair / subdivision may shift the bbox center (drift); without
@@ -1,5 +1,4 @@
-#ifndef libslic3r_Timer_hpp_
-#define libslic3r_Timer_hpp_
+#pragma once

 #include "TriangleMesh.hpp"

@@ -10,5 +9,3 @@ public:
    static TriangleMesh smooth_triangle_mesh(const TriangleMesh &mesh,bool& ok);
 };
 } // namespace Slic3r
-
-#endif // libslic3r_Timer_hpp_
@@ -109,7 +109,6 @@ extern std::string format_memsize_MB(size_t n);
 extern std::string format_memsize(size_t bytes, unsigned int decimals = 1);
 // Return string to be added to the boost::log output to inform about the current process memory allocation.
 // The string is non-empty if the loglevel >= info (3) or ignore_loglevel==true.
-// Latter is used to get the memory info from SysInfoDialog.
 extern std::string log_memory_info(bool ignore_loglevel = false);
 extern void disable_multi_threading();
 // Returns the size of physical memory (RAM) in bytes.
@@ -1744,9 +1744,7 @@ std::string format_diameter_to_str(double diameter, int precision)
    return oss.str();
 }

-// Returns platform-specific string to be used as log output or parsed in SysInfoDialog.
-// The latter parses the string with (semi)colons as separators, it should look about as
-// "desc1: value1; desc2: value2" or similar (spaces should not matter).
+// Returns platform-specific string to be used as log output.
 std::string log_memory_info(bool ignore_loglevel)
 {
    std::string out;
@@ -372,10 +372,6 @@ set(SLIC3R_GUI_SOURCES
    GUI/MarkdownTip.hpp
    GUI/MediaFilePanel.cpp
    GUI/MediaFilePanel.h
-    GUI/OrcaFilesPanel.cpp
-    GUI/OrcaFilesPanel.h
-    GUI/StoragePanel.cpp
-    GUI/StoragePanel.h
    GUI/MediaPlayCtrl.cpp
    GUI/MediaPlayCtrl.h
    GUI/WebRtcMediaController.cpp
@@ -420,8 +416,6 @@ set(SLIC3R_GUI_SOURCES
    GUI/MultiSendMachineModel.hpp
    GUI/MultiTaskManagerPage.cpp
    GUI/MultiTaskManagerPage.hpp
-    GUI/MultiTaskModel.cpp
-    GUI/MultiTaskModel.hpp
    GUI/NetworkTestDialog.cpp
    GUI/NetworkTestDialog.hpp
    GUI/Notebook.cpp
@@ -467,11 +461,6 @@ set(SLIC3R_GUI_SOURCES
    GUI/PresetHints.hpp
    GUI/PrinterCloudAuthDialog.cpp
    GUI/PrinterCloudAuthDialog.hpp
-    GUI/Printer/BambuFileGridModel.cpp
-    GUI/Printer/BambuFileGridModel.h
-    GUI/Printer/IFileGridModel.h
-    GUI/Printer/RemoteFileGridModel.cpp
-    GUI/Printer/RemoteFileGridModel.h
    GUI/Printer/PrinterFileSystem.cpp
    GUI/Printer/PrinterFileSystem.h
    GUI/PrinterWebView.cpp
@@ -785,12 +774,8 @@ set(SLIC3R_GUI_SOURCES
    Utils/ICameraSignalingChannel.hpp
    Utils/OrcaCloudServiceAgent.cpp
    Utils/OrcaCloudServiceAgent.hpp
-    Utils/OrcaMqttConnection.cpp
-    Utils/OrcaMqttConnection.hpp
    Utils/OrcaPrinterAgent.cpp
    Utils/OrcaPrinterAgent.hpp
-    Utils/OrcaCloudSignalingChannel.cpp
-    Utils/OrcaCloudSignalingChannel.hpp
    Utils/QidiPrinterAgent.cpp
    Utils/QidiPrinterAgent.hpp
    Utils/SnapmakerPrinterAgent.cpp
@@ -815,7 +800,6 @@ set(SLIC3R_GUI_SOURCES
    Utils/PrintHost.hpp
    Utils/Process.cpp
    Utils/Process.hpp
-    Utils/Profile.hpp
    Utils/RaycastManager.cpp
    Utils/RaycastManager.hpp
    Utils/Repetier.cpp
@@ -929,7 +913,7 @@ target_include_directories(libslic3r_gui PRIVATE Utils ${CMAKE_CURRENT_BINARY_DI

 if (WIN32)
    target_include_directories(libslic3r_gui SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../deps/WebView2/include)
-    target_link_libraries(libslic3r_gui Advapi32 Crypt32)
+    target_link_libraries(libslic3r_gui Advapi32)
 endif()

 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES})
@@ -7,7 +7,6 @@
 #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"

 #include "slic3r/GUI/DeviceCore/DevManager.h"
-#include "slic3r/GUI/DeviceManager.hpp"

 #include "slic3r/GUI/MsgDialog.hpp"

@@ -1634,16 +1633,8 @@ int AMSDryCtrWin::update_filament_list(DevAms* dev_ams, MachineObject* obj)
        stream << std::fixed << std::setprecision(1) << obj->GetExtderSystem()->GetNozzleDiameter(extruder_id);
        std::string nozzle_diameter_str = stream.str();

-        // The connected device's model may not resolve (OrcaSonar's is optional); the
-        // helper falls back to the selected profile so the list is never empty.
-        const std::string filament_printer_model = resolve_filament_printer_model(obj->printer_type, preset_bundle);
-        if (filament_printer_model.empty()) {
-            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << " cannot resolve a printer model for the filament list";
-            return false;
-        }
-
        for (Preset *filament_it : preset_bundle->get_filament_presets_for_machine(
-                 filament_printer_model, nozzle_diameter_str, obj->is_support_user_preset)) {
+                 DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) {
            if (!filament_id_set.insert(filament_it->filament_id).second)
                continue;
            const std::string filament_alias = filaments.get_preset_alias(*filament_it, true);
@@ -4,12 +4,10 @@
 #include "GUI_App.hpp"
 #include "GUI.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
-#include "slic3r/Utils/NetworkAgentFactory.hpp"
 #include "libslic3r/Preset.hpp"
 #include "I18N.hpp"
 #include <algorithm>
 #include <boost/log/trivial.hpp>
-#include <slic3r/GUI/DeviceManager.hpp>
 #include <string>
 #include <sstream>
 #include <ios>
@@ -498,13 +496,6 @@ void AMSMaterialsSetting::update_filament_editing(bool is_printing)
        m_button_confirm->Show(true);
    }

-    // A third-party tray owns its temp range; BBL RFID trays keep the read-only preset values.
-    // Only the OrcaSonar agent accepts the temp fields, so other agents stay read-only.
-    const bool is_orca_agent = obj && obj->printer_agent_id == ORCA_PRINTER_AGENT_ID;
-    const bool can_edit = !is_printing || obj->is_support_filament_setting_inprinting;
-    m_input_nozzle_min->Enable(m_is_third && can_edit && is_orca_agent);
-    m_input_nozzle_max->Enable(m_is_third && can_edit && is_orca_agent);
-
    if (!m_is_third) {
        m_tip_readonly->SetLabelText(wxEmptyString);
        m_tip_readonly->Hide();
@@ -527,8 +518,6 @@ void AMSMaterialsSetting::update_filament_editing(bool is_printing)
    if (m_view_only) { // Orca: view-only (2D laser/cut) — lock every edit control and hide apply/reset
        m_comboBox_filament->Enable(false);
        m_comboBox_cali_result->Enable(false);
-        m_input_nozzle_min->Enable(false);
-        m_input_nozzle_max->Enable(false);
        m_input_k_val->Enable(false);
        m_input_n_val->Enable(false);
        m_button_confirm->Hide();
@@ -577,7 +566,7 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
        }

        // set k / n value
-        if (obj->supports_extrusion_cali() && obj->cali_version <= -1 && obj->get_printer_series() == PrinterSeries::SERIES_P1P) {
+        if (obj->cali_version <= -1 && obj->get_printer_series() == PrinterSeries::SERIES_P1P) {
            // set extrusion cali ratio
            int cali_tray_id = ams_id * 4 + slot_id;

@@ -598,7 +587,7 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
            }
            obj->command_extrusion_cali_set(cali_tray_id, "", "", k, n);
        }
-        else if (obj->supports_extrusion_cali()) {
+        else {
            PACalibIndexInfo select_index_info;
            int tray_id = ams_id * 4 + slot_id;
            if (is_virtual_tray()) {
@@ -758,21 +747,6 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
        return;
    }

-    if (nozzle_temp_min_int < FILAMENT_MIN_TEMP || nozzle_temp_min_int > FILAMENT_MAX_TEMP ||
-        nozzle_temp_max_int < FILAMENT_MIN_TEMP || nozzle_temp_max_int > FILAMENT_MAX_TEMP) {
-        MessageDialog msg_dlg(nullptr,
-            wxString::Format(_L("The input value should be greater than %1% and less than %2%"), FILAMENT_MIN_TEMP, FILAMENT_MAX_TEMP),
-            wxEmptyString, wxICON_WARNING | wxOK);
-        msg_dlg.ShowModal();
-        return;
-    }
-    if (nozzle_temp_min_int > nozzle_temp_max_int) {
-        MessageDialog msg_dlg(nullptr, _L("The minimum temperature cannot be greater than the maximum temperature."),
-                              wxEmptyString, wxICON_WARNING | wxOK);
-        msg_dlg.ShowModal();
-        return;
-    }
-

    // Orca: log the tray payload this dialog hands the printer, so the filament_id resolved from the
    // dropdown selection can be checked against the tray_info_idx the AMS actually receives. A
@@ -796,7 +770,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
    wxString k_text = m_input_k_val->GetTextCtrl()->GetValue();
    wxString n_text = m_input_n_val->GetTextCtrl()->GetValue();

-    if (obj->supports_extrusion_cali() && obj->cali_version <= -1 && (obj->get_printer_series() != PrinterSeries::SERIES_X1) && !ExtrusionCalibration::check_k_validation(k_text)) {
+    if (obj->cali_version <= -1 && (obj->get_printer_series() != PrinterSeries::SERIES_X1) && !ExtrusionCalibration::check_k_validation(k_text)) {
        wxString k_tips = wxString::Format(_L("Please input a valid value (K in %.1f~%.1f)"), MIN_PA_K_VALUE, MAX_PA_K_VALUE);
        wxString kn_tips = wxString::Format(_L("Please input a valid value (K in %.1f~%.1f, N in %.1f~%.1f)"), MIN_PA_K_VALUE, MAX_PA_K_VALUE, 0.6, 2.0);
        MessageDialog msg_dlg(nullptr, k_tips, wxEmptyString, wxICON_WARNING | wxOK);
@@ -826,7 +800,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
            vt_tray = VIRTUAL_TRAY_DEPUTY_ID;
        }

-        if (obj->supports_extrusion_cali() && obj->cali_version >= 0) {
+        if (obj->cali_version >= 0) {
            PACalibIndexInfo select_index_info;
            select_index_info.tray_id = vt_tray;
            select_index_info.ams_id = ams_id;
@@ -845,7 +819,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)

            CalibUtils::select_PA_calib_result(select_index_info);
        }
-        else if (obj->supports_extrusion_cali()) {
+        else {
            obj->command_extrusion_cali_set(vt_tray, "", "", k, n);
        }
    }
@@ -867,7 +841,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
            ;
        }

-        if (obj->supports_extrusion_cali() && obj->cali_version >= 0) {
+        if (obj->cali_version >= 0) {
            PACalibIndexInfo select_index_info;
            select_index_info.tray_id = cali_tray_id;
            select_index_info.ams_id = ams_id;
@@ -886,7 +860,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)

            CalibUtils::select_PA_calib_result(select_index_info);
        }
-        else if (obj->supports_extrusion_cali()) {
+        else {
            obj->command_extrusion_cali_set(cali_tray_id, "", "", k, n);
        }
    }
@@ -982,12 +956,7 @@ bool AMSMaterialsSetting::is_virtual_tray()

 void AMSMaterialsSetting::update_widgets()
 {
-    if (obj && !obj->supports_extrusion_cali()) {
-        // No printer-side K/N records: do not offer them.
-        m_panel_normal->Show();
-        m_panel_kn->Hide();
-    }
-    else if (obj && obj->get_printer_series() == PrinterSeries::SERIES_X1 && obj->cali_version <= -1) {
+    if (obj && obj->get_printer_series() == PrinterSeries::SERIES_X1 && obj->cali_version <= -1) {
        // Low version firmware does not display k value
        m_panel_kn->Hide();
    }
@@ -1175,9 +1144,6 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi

    m_input_k_val->GetTextCtrl()->SetValue(k);
    m_input_n_val->GetTextCtrl()->SetValue(n);
-    // Tray values are re-supplied by every caller; clear so a previous popup cannot leak in.
-    m_input_nozzle_min->GetTextCtrl()->SetValue(wxEmptyString);
-    m_input_nozzle_max->GetTextCtrl()->SetValue(wxEmptyString);

    wxString bambu_filament_name;
    std::unordered_map<wxString, wxString> query_filament_vendors;// some information for sort
@@ -1203,14 +1169,11 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
    }
    stream << std::fixed << std::setprecision(1) << machine_diameter;
    std::string nozzle_diameter_str = stream.str();
-    // OrcaSonar's model id is optional, so the device model alone can resolve to nothing;
-    // the helper falls back to the selected profile so the dropdown is never empty.
-    const std::string filament_printer_model = resolve_filament_printer_model(obj->printer_type, preset_bundle);

-    if (preset_bundle && !filament_printer_model.empty()) {
+    if (preset_bundle) {
        BOOST_LOG_TRIVIAL(trace) << "system_preset_bundle filament number=" << preset_bundle->filaments.size();
        for (Preset *filament_it : preset_bundle->get_filament_presets_for_machine(
-                 filament_printer_model, nozzle_diameter_str, obj->is_support_user_preset)) {
+                 DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) {
            if (!filament_id_set.insert(filament_it->filament_id).second)
                continue;
            const std::string alias = preset_bundle->filaments.get_preset_alias(*filament_it, true);
@@ -1276,12 +1239,6 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
        else {
            m_comboBox_filament->Show();
            m_readonly_filament->Hide();
-            // A printer-set tray carries its own temps; the preset selection only fills
-            // them when the tray has none.
-            if (!temp_min.IsEmpty() && temp_min != "0")
-                m_input_nozzle_min->GetTextCtrl()->SetValue(temp_min);
-            if (!temp_max.IsEmpty() && temp_max != "0")
-                m_input_nozzle_max->GetTextCtrl()->SetValue(temp_max);
        }

        if (obj->cali_version >= 0) {
@@ -1405,19 +1362,17 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
        std::sort(m_sorted_filament_items.begin(), m_sorted_filament_items.end(), _filament_sorter);
    }

-    if (m_sorted_filament_items.empty())
-        BOOST_LOG_TRIVIAL(warning) << "ams_materials_setting: no filament presets for printer model \""
-                                   << filament_printer_model << "\" at nozzle " << nozzle_diameter_str;
-
    rebuild_filament_dropdown_items(ams_filament_id);
    int selection_idx = m_comboBox_filament->GetSelection();
-    m_comboBox_from_printer = true;
    post_select_event(selection_idx);

    if (selection_idx < 0) {
        m_comboBox_filament->SetValue(wxEmptyString);
    }

+    // Set the flag whether to open the filament setting dialog from the device page
+    m_comboBox_filament->SetClientData(new int(1));
+
    update();
    Layout();
    Fit();
@@ -1461,18 +1416,18 @@ int AMSMaterialsSetting::get_filament_variant_index(const Preset &filament, cons

 void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
 {
-    // True for the popup's own initial selection: the dialog pre-filled the tray's
-    // temps, so the matching preset must not overwrite them.
-    const bool initial_printer_selection = m_comboBox_from_printer;
+    // Get the flag whether to open the filament setting dialog from the device page
+    int* from_printer = static_cast<int*>(m_comboBox_filament->GetClientData());

    m_filament_type = "";
    const FilamentInfos* selected_info = selected_filament_info();
    PresetBundle* preset_bundle = wxGetApp().preset_bundle;
-    std::string filament_printer_model;
    if (preset_bundle) {
        std::ostringstream stream;
        if (obj) {
-            // Use the selected profile's nozzle diameter until the connected device reports one.
+            // Defensive: this dialog is opened only from StatusPanel (BBL-only) today, so the fallback fires
+            // only during the brief BBL startup window before firmware reports nozzle info. Without this,
+            // the "0.0" lookup string returns an empty set and filament lookup yields no results.
            float machine_diameter = obj->GetExtderSystem()->GetNozzleDiameter(0);
            if (machine_diameter == 0.0f) {
                const ConfigOption *opt = preset_bundle->printers.get_selected_preset().config.option("nozzle_diameter");
@@ -1482,35 +1437,32 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
                }
            }
            stream << std::fixed << std::setprecision(1) << machine_diameter;
-            filament_printer_model = resolve_filament_printer_model(obj->printer_type, preset_bundle);
        }
        std::string nozzle_diameter_str = stream.str();
        // Resolve the selection against the same list Popup() built the dropdown from, so the two
        // halves of the dialog cannot disagree about which filaments this machine can use.
-        if (selected_info && !filament_printer_model.empty()) {
+        if (selected_info) {
            const std::string& filament_id = selected_info->filament_id;
            for (Preset *it : preset_bundle->get_filament_presets_for_machine(
-                     filament_printer_model, nozzle_diameter_str, obj->is_support_user_preset)) {
+                     DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) {
                if (it->filament_id != filament_id)
                    continue;
-                if (!initial_printer_selection) {
-                    // ) if nozzle_temperature_range is found
-                    const int variant_index = get_filament_variant_index(*it, nozzle_diameter_str);
-                    ConfigOption* opt_min = it->config.option("nozzle_temperature_range_low");
-                    if (opt_min) {
-                        ConfigOptionInts* opt_min_ints = dynamic_cast<ConfigOptionInts*>(opt_min);
-                        if (opt_min_ints) {
-                            wxString text_nozzle_temp_min = wxString::Format("%d", opt_min_ints->get_at(variant_index));
-                            m_input_nozzle_min->GetTextCtrl()->SetValue(text_nozzle_temp_min);
-                        }
+                // ) if nozzle_temperature_range is found
+                const int variant_index = get_filament_variant_index(*it, nozzle_diameter_str);
+                ConfigOption* opt_min = it->config.option("nozzle_temperature_range_low");
+                if (opt_min) {
+                    ConfigOptionInts* opt_min_ints = dynamic_cast<ConfigOptionInts*>(opt_min);
+                    if (opt_min_ints) {
+                        wxString text_nozzle_temp_min = wxString::Format("%d", opt_min_ints->get_at(variant_index));
+                        m_input_nozzle_min->GetTextCtrl()->SetValue(text_nozzle_temp_min);
                    }
-                    ConfigOption* opt_max = it->config.option("nozzle_temperature_range_high");
-                    if (opt_max) {
-                        ConfigOptionInts* opt_max_ints = dynamic_cast<ConfigOptionInts*>(opt_max);
-                        if (opt_max_ints) {
-                            wxString text_nozzle_temp_max = wxString::Format("%d", opt_max_ints->get_at(variant_index));
-                            m_input_nozzle_max->GetTextCtrl()->SetValue(text_nozzle_temp_max);
-                        }
+                }
+                ConfigOption* opt_max = it->config.option("nozzle_temperature_range_high");
+                if (opt_max) {
+                    ConfigOptionInts* opt_max_ints = dynamic_cast<ConfigOptionInts*>(opt_max);
+                    if (opt_max_ints) {
+                        wxString text_nozzle_temp_max = wxString::Format("%d", opt_max_ints->get_at(variant_index));
+                        m_input_nozzle_max->GetTextCtrl()->SetValue(text_nozzle_temp_max);
                    }
                }
                ConfigOption* opt_type = it->config.option("filament_type");
@@ -1549,16 +1501,13 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
        m_button_confirm->Disable(); // ORCA No need to change style
        m_comboBox_cali_result->Clear();
        m_comboBox_cali_result->SetValue(wxEmptyString);
-        if (!initial_printer_selection) {
-            m_input_k_val->GetTextCtrl()->SetValue(wxEmptyString);
-            m_input_n_val->GetTextCtrl()->SetValue(wxEmptyString);
-        }
-        m_comboBox_from_printer = false;
+        m_input_k_val->GetTextCtrl()->SetValue(wxEmptyString);
+        m_input_n_val->GetTextCtrl()->SetValue(wxEmptyString);
+        m_comboBox_filament->SetClientData(new int(0));
        return;
    }
    else {
-        if (!m_view_only)
-            m_button_confirm->Enable(true);  // ORCA No need to change style
+        m_button_confirm->Enable(true);  // ORCA No need to change style
    }

    //filament id
@@ -1570,9 +1519,6 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
        ams_setting_id  = selected_info->setting_id;
    }

-    if (!ams_filament_id.empty())
-        m_clr_picker->is_empty(false);
-
    wxArrayString items;
    m_pa_profile_items.clear();
    m_comboBox_cali_result->SetValue(wxEmptyString);
@@ -1628,7 +1574,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)

        m_comboBox_cali_result->Set(items);
        if (ams_id == VIRTUAL_TRAY_MAIN_ID || ams_id == VIRTUAL_TRAY_DEPUTY_ID) {
-            if (initial_printer_selection) {
+            if (from_printer && (*from_printer == 1)) {
                for (auto slot : obj->vt_slot) {
                    if (slot.id == std::to_string(ams_id))
                        cali_select_idx = CalibUtils::get_selected_calib_idx(m_pa_profile_items, slot.cali_idx);
@@ -1645,11 +1591,10 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
            }
        }
        else {
-            if (initial_printer_selection) {
+            if (from_printer && (*from_printer == 1)) {
                DevAmsTray* selected_tray = this->obj->GetFilaSystem()->GetAmsTray(std::to_string(ams_id), std::to_string(slot_id));
                if (!selected_tray)
                {
-                    m_comboBox_from_printer = false;
                    return;
                }

@@ -1680,7 +1625,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
    else {
        if (!ams_filament_id.empty()) {
            //m_input_k_val->GetTextCtrl()->SetValue("0.00");
-            m_input_k_val->Enable(!m_view_only);
+            m_input_k_val->Enable(true);
        }
        else {
            //m_input_k_val->GetTextCtrl()->SetValue("0.00");
@@ -1688,7 +1633,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
        }
    }

-    m_comboBox_from_printer = false;
+    m_comboBox_filament->SetClientData(new int(0));
 }

 void AMSMaterialsSetting::on_dpi_changed(const wxRect &suggested_rect)
@@ -138,7 +138,7 @@ public:
    std::string    ams_filament_id;
    std::string    ams_setting_id;

-    bool           m_is_third = false;
+    bool           m_is_third;
    // Orca: view-only mode (laser/cut). When set, the dialog is inspectable but every
    // editing control is disabled and no command is sent.
    bool           m_view_only = false;
@@ -206,9 +206,6 @@ protected:
    wxStaticText*       m_n_param;
    TextInput*          m_input_n_val;
    int                 m_filament_selection;
-    // True while the popup's initial, printer-driven selection is being handled; it
-    // keeps that selection from overwriting the tray's own temps with preset temps.
-    bool                m_comboBox_from_printer = false;

    int m_pa_cali_select_id = 0;

@@ -530,8 +530,7 @@ void AMSSetting::on_insert_material_read(wxCommandEvent &event)
    bool tray_read_opt = m_checkbox_Insert_material_auto_read->GetValue();
    bool remain_opt = m_checkbox_remain->GetValue();

-    if (m_obj->command_ams_user_settings(start_read_opt, tray_read_opt, remain_opt) != 0)
-        UpdateByObj(m_obj);
+    m_obj->command_ams_user_settings(start_read_opt, tray_read_opt, remain_opt);

    m_sizer_Insert_material_tip_inline->Layout();
    Layout();
@@ -557,8 +556,7 @@ void AMSSetting::on_starting_read(wxCommandEvent &event)
    bool tray_read_opt  = m_checkbox_Insert_material_auto_read->GetValue();
    bool remain_opt = m_checkbox_remain->GetValue();

-    if (m_obj->command_ams_user_settings(start_read_opt, tray_read_opt, remain_opt) != 0)
-        UpdateByObj(m_obj);
+    m_obj->command_ams_user_settings(start_read_opt, tray_read_opt, remain_opt);

    m_sizer_starting_tip_inline->Layout();
    Layout();
@@ -572,8 +570,7 @@ void AMSSetting::on_remain(wxCommandEvent& event)
    bool start_read_opt = m_checkbox_starting_auto_read->GetValue();
    bool tray_read_opt = m_checkbox_Insert_material_auto_read->GetValue();
    bool remain_opt = m_checkbox_remain->GetValue();
-    if (m_obj->command_ams_user_settings(start_read_opt, tray_read_opt, remain_opt) != 0)
-        UpdateByObj(m_obj);
+    m_obj->command_ams_user_settings(start_read_opt, tray_read_opt, remain_opt);
    event.Skip();
 }

@@ -809,4 +806,4 @@ void AMSSettingArrangeAMSOrder::OnBtnRearrangeClicked(wxCommandEvent& event)
 }
 #endif

-}} // namespace Slic3r::GUI
+}} // namespace Slic3r::GUI
@@ -10,7 +10,6 @@
 #include "Widgets/DialogButtons.hpp"
 #include "libslic3r/Config.hpp"
 #include <boost/log/trivial.hpp>
-#include <slic3r/GUI/DeviceManager.hpp>
 #include <string>
 #include <vector>
 #include "libslic3r/calib.hpp"
@@ -746,15 +745,9 @@ wxArrayString NewCalibrationHistoryDialog::get_all_filaments(const MachineObject
    std::string nozzle_diameter_str = stream.str();

    if (preset_bundle) {
-        // OrcaSonar's model id is optional; the helper falls back to the selected profile
-        // so the list is never empty.
-        const std::string filament_printer_model = resolve_filament_printer_model(obj->printer_type, preset_bundle);
-        if (filament_printer_model.empty())
-            return filament_items;
-
        BOOST_LOG_TRIVIAL(trace) << "system_preset_bundle filament number=" << preset_bundle->filaments.size();
        for (Preset *filament_it : preset_bundle->get_filament_presets_for_machine(
-                 filament_printer_model, nozzle_diameter_str, obj->is_support_user_preset)) {
+                 DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) {
            if (!filament_id_set.insert(filament_it->filament_id).second)
                continue;
            const std::string alias = preset_bundle->filaments.get_preset_alias(*filament_it, true);
@@ -1,5 +1,4 @@
-#ifndef slic3r_GUI_SingleChoice_hpp_
-#define slic3r_GUI_SingleChoice_hpp_
+#pragma once

 #include "GUI_Utils.hpp"
 #include "Plater.hpp"
@@ -33,5 +32,3 @@ private:

 };
 }} // namespace Slic3r::GUI
-
-#endif
@@ -1,19 +0,0 @@
-#include <exception> 
-#include <stdexcept>
-
-#include "libslic3r/Exception.hpp"
-
-namespace Slic3r {
-
-class ConfigError : public Slic3r::RuntimeError { 
-	using Slic3r::RuntimeError::RuntimeError;
-};
-
-namespace GUI {
-
-class ConfigGUITypeError : public ConfigError { 
-	using ConfigError::ConfigError;
-};
-
-} // namespace GUI
-} // namespace Slic3r
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <array>
 #include <cstddef>
 #include <cassert>
@@ -9,7 +8,6 @@
 #include <cstdlib>
 #include <chrono>
 #include <nlohmann/json.hpp>
-#include <wx/app.h>
 #include <wx/colour.h>
 #include <string>
 #include <wx/string.h>
@@ -21,7 +19,6 @@
 #include <utility>
 #include "DevFilaSystem.h"
 #include "slic3r/Utils/NetworkAgent.hpp"
-#include "slic3r/Utils/NetworkAgentFactory.hpp" // ORCA_PRINTER_AGENT_ID
 #include "DevNozzleSystem.h" // DevNozzle / DevNozzleSystem for GetNozzleFlowStringByAmsId

 // TODO: remove this include
@@ -64,15 +61,6 @@ void DevAmsTray::UpdateColorFromStr(const std::string& color)
    }
 }

-void DevAmsTray::UpdateEmptyState(bool material_fields_present, bool classify_empty)
-{
-    const auto is_zero_or_empty = [](const std::string& value) {
-        return value.empty() || std::all_of(value.begin(), value.end(), [](char c) { return c == '0'; });
-    };
-    is_empty = material_fields_present && classify_empty && setting_id.empty() && m_fila_type.empty() &&
-               is_zero_or_empty(color) && is_zero_or_empty(tag_uid);
-}
-
 void DevAmsTray::reset()
 {
    tag_uid             = "";
@@ -94,7 +82,6 @@ void DevAmsTray::reset()
    k                   = 0.0f;
    n                   = 0.0f;
    is_bbl              = false;
-    is_empty            = false;
    hold_count          = 0;
    remain              = 0;
 }
@@ -694,7 +681,7 @@ void DevFilaSystemParser::ParseV1_0(const json& jj, MachineObject* obj, DevFilaS
                                //std::string type            = (*tray_it)["tray_type"].get<std::string>();
                                std::string type = MachineObject::setting_id_to_type(curr_tray->setting_id, (*tray_it)["tray_type"].get<std::string>());
                                // curr_tray->setting_id is our OF id; GFS00/GFS01 are the printer's own support-filament ids.
-                                auto* agent = wxTheApp != nullptr ? GUI::wxGetApp().getAgent() : nullptr;
+                                auto* agent = GUI::wxGetApp().getAgent();
                                const std::string printer_filament_id = agent ? agent->from_orca_filament_id(curr_tray->setting_id) : curr_tray->setting_id;
                                if (printer_filament_id == "GFS00")
                                {
@@ -794,8 +781,6 @@ void DevFilaSystemParser::ParseV1_0(const json& jj, MachineObject* obj, DevFilaS
                            {
                                curr_tray->remain = -1;
                            }
-                            curr_tray->UpdateEmptyState(tray_it->contains("tray_info_idx") && tray_it->contains("tray_type"),
-                                                        obj->printer_agent_id == ORCA_PRINTER_AGENT_ID);
                            // The tray objects are reused across status updates. Reset this
                            // state when a previously empty slot receives a filament again.
                            curr_tray->is_slot_placeholder = tray_it->contains("tray_slot_placeholder");
@@ -82,7 +82,6 @@ public:
    wxColour        wx_color;
    bool            is_bbl;
    bool            is_exists = false;
-    bool            is_empty = false;  // Explicitly reported as having no filament.
    bool            is_slot_placeholder = false;  // Orca: True for empty tray slots from pull-mode agents
    int             hold_count = 0;
    int             remain = 0;         // filament remain: 0 ~ 100
@@ -91,15 +90,13 @@ public:
    // operators
    bool operator==(DevAmsTray const& o) const
    {
-        return id == o.id && m_fila_type == o.m_fila_type && filament_setting_id == o.filament_setting_id &&
-               color == o.color && is_empty == o.is_empty;
+        return id == o.id && m_fila_type == o.m_fila_type && filament_setting_id == o.filament_setting_id && color == o.color;
    }
    bool operator!=(DevAmsTray const& o) const { return !operator==(o); }

    // setters
    void reset();
    void UpdateColorFromStr(const std::string& color);
-    void UpdateEmptyState(bool material_fields_present, bool classify_empty);
    void set_hold_count() { hold_count = HOLD_COUNT_MAX; }

    // getter
@@ -64,7 +64,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <wx/app.h>
 #include <wx/colour.h>
 #include <tuple>
 #include <wx/dir.h>
@@ -432,32 +431,6 @@ NozzleVolumeType convert_to_nozzle_type(const std::string &str)
    return res;
 }

-std::string resolve_filament_printer_model(const std::string& printer_type, PresetBundle* preset_bundle)
-{
-    if (!preset_bundle)
-        return {};
-
-    // Devices with a shipped printer config (Bambu) resolve directly.
-    if (const std::string display_name = DevPrinterConfigUtil::get_printer_display_name(printer_type); !display_name.empty())
-        return display_name;
-
-    // A vendor model id the device reported (SSDP modelNumber, manual binding).
-    if (!printer_type.empty()) {
-        if (const std::string model_name = preset_bundle->get_printer_model_display_name(printer_type); !model_name.empty())
-            return model_name;
-    }
-
-    // OrcaSonar's model id is optional; a generic device resolves against the selected profile.
-    if (const ConfigOptionString* model = preset_bundle->printers.get_selected_preset().config.opt<ConfigOptionString>("printer_model");
-        model && !model->value.empty()) {
-        BOOST_LOG_TRIVIAL(info) << "resolve_filament_printer_model: device type \"" << printer_type
-                                << "\" has no installed model; using the selected profile \"" << model->value << "\"";
-        return model->value;
-    }
-
-    return {};
-}
-
 wxString MachineObject::get_printer_type_display_str() const
 {
    std::string display_name = DevPrinterConfigUtil::get_printer_display_name(printer_type);
@@ -1760,10 +1733,6 @@ int MachineObject::check_resume_condition()
 }
 int MachineObject::command_ams_change_filament(bool load, std::string ams_id, std::string slot_id, int old_temp, int new_temp, std::optional<int> extruder_id)
 {
-    if (!printer_supports_command("print.ams_change_filament")) {
-        BOOST_LOG_TRIVIAL(warning) << "command_ams_change_filament: printer agent does not support the command";
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
-    }
    json j;
    try {
        auto tray_id = 0;
@@ -1807,10 +1776,6 @@ int MachineObject::command_ams_change_filament(bool load, std::string ams_id, st

 int MachineObject::command_ams_user_settings(bool start_read_opt, bool tray_read_opt, bool remain_flag)
 {
-    if (!printer_supports_command("print.ams_user_setting")) {
-        BOOST_LOG_TRIVIAL(warning) << "command_ams_user_settings: printer agent does not support the command";
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
-    }
    json j;
    j["print"]["command"] = "ams_user_setting";
    j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
@@ -1819,59 +1784,22 @@ int MachineObject::command_ams_user_settings(bool start_read_opt, bool tray_read
    j["print"]["tray_read_option"]      = tray_read_opt;
    j["print"]["calibrate_remain_flag"] = remain_flag;

-    const int rc = this->publish_json(j);
-    if (rc == 0) {
-        m_fila_system->GetAmsSystemSetting().SetDetectOnInsertEnabled(tray_read_opt);
-        m_fila_system->GetAmsSystemSetting().SetDetectOnPowerupEnabled(start_read_opt);
-        m_fila_system->GetAmsSystemSetting().SetDetectRemainEnabled(remain_flag);
-        ams_user_setting_start = time(nullptr);
-    }
-    return rc;
+    m_fila_system->GetAmsSystemSetting().SetDetectOnInsertEnabled(tray_read_opt);
+    m_fila_system->GetAmsSystemSetting().SetDetectOnPowerupEnabled(start_read_opt);
+    m_fila_system->GetAmsSystemSetting().SetDetectRemainEnabled(remain_flag);
+    ams_user_setting_start = time(nullptr);
+
+    return this->publish_json(j);
 }

 int MachineObject::command_ams_calibrate(int ams_id)
 {
    if (!m_agent) return -1;
-    if (!m_agent->owns_agent(printer_agent_id))
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
    return command_with_dialog(m_agent->command_ams_calibrate(get_dev_id(), ams_id, MachineObject::m_sequence_id++, is_lan_mode_printer()));
 }

-bool MachineObject::printer_supports_command(const char* command) const
-{
-    if (!command || !m_agent)
-        return false;
-    return m_agent->supports_command(printer_agent_id, get_dev_id(), command);
-}
-
-bool MachineObject::printer_uses_filament_mapping() const
-{
-    if (!m_agent)
-        return false;
-    // An unrecorded owner goes through owns_agent() like any other, because
-    // whichever agent is active is also the one formatting the payload. Only a
-    // recorded owner that differs from the active agent is a mismatch.
-    return m_agent->uses_filament_mapping(printer_agent_id);
-}
-
-bool MachineObject::printer_supports_feature(const char* feature) const
-{
-    return feature && m_agent && m_agent->supports_feature(printer_agent_id, get_dev_id(), feature);
-}
-
-bool MachineObject::supports_extrusion_cali() const
-{
-    // Devices with no agent id predate the agent split and keep the Bambu path.
-    return printer_agent_id.empty() || printer_agent_id == BBL_PRINTER_AGENT_ID;
-}
-
 int MachineObject::command_ams_filament_settings(int ams_id, int slot_id, std::string filament_id, std::string setting_id, std::string tray_color, std::string tray_type, int nozzle_temp_min, int nozzle_temp_max)
 {
-    if (!printer_supports_command("print.ams_filament_setting")) {
-        BOOST_LOG_TRIVIAL(warning) << "command_ams_filament_settings: printer agent does not support slot metadata updates";
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
-    }
-
    int tag_tray_id = 0;
    int tag_ams_id  = ams_id;
    int tag_slot_id = slot_id;
@@ -1906,10 +1834,6 @@ int MachineObject::command_ams_filament_settings(int ams_id, int slot_id, std::s
 int MachineObject::command_ams_refresh_rfid(int ams_id, int slot_id)
 {
    if (!m_agent) return -1;
-    if (!printer_supports_command("print.ams_get_rfid")) {
-        BOOST_LOG_TRIVIAL(warning) << "command_ams_refresh_rfid: printer agent does not support the command";
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
-    }
    return command_with_dialog(m_agent->command_ams_refresh_rfid(get_dev_id(), ams_id, slot_id, MachineObject::m_sequence_id++, is_lan_mode_printer()));
 }

@@ -1923,19 +1847,11 @@ int MachineObject::command_start_camera()
 int MachineObject::command_ams_select_tray(std::string tray_id)
 {
    if (!m_agent) return -1;
-    if (!printer_supports_command("print.ams_change_filament")) {
-        BOOST_LOG_TRIVIAL(warning) << "command_ams_select_tray: printer agent does not support the command";
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
-    }
    return command_with_dialog(m_agent->command_ams_select_tray(get_dev_id(), tray_id, MachineObject::m_sequence_id++, is_lan_mode_printer()));
 }

 int MachineObject::command_ams_control(std::string action)
 {
-    if (!printer_supports_command("print.ams_control")) {
-        BOOST_LOG_TRIVIAL(warning) << "command_ams_control: printer agent does not support the command";
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
-    }
    if (action == "resume" && check_resume_condition()) return 0;

    //valid actions
@@ -1951,10 +1867,6 @@ int MachineObject::command_ams_control(std::string action)

 int MachineObject::command_ams_drying_stop()
 {
-    if (!printer_supports_command("print.auto_stop_ams_dry")) {
-        BOOST_LOG_TRIVIAL(warning) << "command_ams_drying_stop: printer agent does not support the command";
-        return command_with_dialog(ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED);
-    }
    json j;
    j["print"]["command"] = "auto_stop_ams_dry";
    j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
@@ -2905,9 +2817,7 @@ bool MachineObject::is_camera_busy_off()
 int MachineObject::publish_json(const json& json_item, int qos, int flag)
 {
    int rtn = 0;
-    if (m_agent && !m_agent->owns_agent(printer_agent_id)) {
-        rtn = ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED;
-    } else if (is_lan_mode_printer()) {
+    if (is_lan_mode_printer()) {
        rtn = local_publish_json(json_item.dump(), qos, flag);
    } else {
        rtn = cloud_publish_json(json_item.dump(), qos, flag);
@@ -2951,7 +2861,6 @@ int MachineObject::local_publish_json(std::string json_str, int qos, int flag)
 std::string MachineObject::setting_id_to_type(std::string setting_id, std::string tray_type)
 {
    std::string type;
-    if (wxTheApp == nullptr) return tray_type;
    PresetBundle* preset_bundle = GUI::wxGetApp().preset_bundle;
    if (preset_bundle) {
        for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) {
@@ -4288,9 +4197,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
                            vt_slot[0].setting_id = jj["tray_info_idx"].get<std::string>();
                            //vt_tray.type = jj["tray_type"].get<std::string>();
                            vt_slot[0].m_fila_type = setting_id_to_type(vt_slot[0].setting_id, jj["tray_type"].get<std::string>());
-                            // The ack carries the whole slot; re-derive empty so the panel flips off
-                            // "Empty" without waiting out the hold.
-                            vt_slot[0].UpdateEmptyState(true, printer_agent_id == ORCA_PRINTER_AGENT_ID);
                            // delay update
                            vt_slot[0].set_hold_count();
                        } else {
@@ -4316,9 +4222,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_

                                    tray_it->second->setting_id = jj["tray_info_idx"].get<std::string>();
                                    tray_it->second->m_fila_type = setting_id_to_type(tray_it->second->setting_id, jj["tray_type"].get<std::string>());
-                                    // The ack carries the whole slot; re-derive empty so the panel flips off
-                                    // "Empty" without waiting out the hold.
-                                    tray_it->second->UpdateEmptyState(true, printer_agent_id == ORCA_PRINTER_AGENT_ID);
                                    // delay update
                                    tray_it->second->set_hold_count();
                                } else {
@@ -5257,7 +5160,7 @@ DevAmsTray MachineObject::parse_vt_tray(json vtray)
            //std::string type = vtray["tray_type"].get<std::string>();
            std::string type = setting_id_to_type(vt_tray.setting_id, vtray["tray_type"].get<std::string>());
            // vt_tray.setting_id is our OF id (translated on the way in); the two support ids below are the printer's own.
-            auto* agent = wxTheApp != nullptr ? GUI::wxGetApp().getAgent() : nullptr;
+            auto* agent = GUI::wxGetApp().getAgent();
            const std::string printer_filament_id = agent ? agent->from_orca_filament_id(vt_tray.setting_id) : vt_tray.setting_id;
            if (printer_filament_id == "GFS00") {
                vt_tray.m_fila_type = "PLA-S";
@@ -5352,8 +5255,6 @@ DevAmsTray MachineObject::parse_vt_tray(json vtray)
        else {
            vt_tray.remain = -1;
        }
-        vt_tray.UpdateEmptyState(vtray.contains("tray_info_idx") && vtray.contains("tray_type"),
-                                 printer_agent_id == ORCA_PRINTER_AGENT_ID);
    }

    return vt_tray;
@@ -5647,11 +5548,11 @@ void MachineObject::parse_new_info2(const json& info)
    if (capabilities_it == info.end() || !capabilities_it->is_object())
        return;
    const auto flags_it = capabilities_it->find("flags");
-    const bool has_flags = flags_it != capabilities_it->end() && flags_it->is_object();
-    if (!has_flags)
+    if (flags_it == capabilities_it->end() || !flags_it->is_object())
        return;
+
    const json& flags = *flags_it;
-    BOOST_LOG_TRIVIAL(info) << "parse_new_info2: capability flags=" << flags.dump();
+    BOOST_LOG_TRIVIAL(info) << "parse_new_info2: OrcaSonar capability flags=" << flags.dump();

    auto parse_bool = [&flags](const char* name, bool& target) {
        const auto it = flags.find(name);
@@ -14,7 +14,6 @@
 #include <string>
 #include <memory>
 #include <chrono>
-#include <set>
 #include <unordered_set>
 #include <optional>
 #include <boost/thread.hpp>
@@ -73,7 +72,6 @@ class DeviceErrorDialog; // Previous definitions

 class NetworkAgent;
 // Orca: ManualPaCaliMethod now provided by DeviceCore/DevCalib.h (enum class)
-class PresetBundle;

 #define UpgradeNoError          0
 #define UpgradeDownloadFailed   -1
@@ -109,11 +107,6 @@ struct DevPrintTaskRatingInfo;
 // given nozzle diameter (mm), bucketed per nozzle size to mirror the printer firmware.
 bool is_stringing_prone_filament(const std::string& filament_id, float nozzle_diameter);

-// The printer model filament presets are matched against for a connected machine. OrcaSonar's
-// model id is optional, so a device with no installed vendor model falls back to the selected
-// printer profile rather than resolving to no filament list at all.
-std::string resolve_filament_printer_model(const std::string& printer_type, PresetBundle* preset_bundle);
-
 class MachineObject
 {
 private:
@@ -802,13 +795,6 @@ public:
    int command_refresh_nozzle();
    int command_set_chamber(int temp);
    int check_resume_condition();
-    bool printer_supports_command(const char* command) const;
-    bool printer_supports_feature(const char* feature) const;
-    bool printer_uses_filament_mapping() const;
-    // The per-tray flow-dynamics K/N records are a Bambu firmware feature. Other
-    // agents have no printer-side calibration to read or write, so the AMS UI must
-    // not offer K/N for them.
-    bool supports_extrusion_cali() const;
    // ams controls
    //int command_ams_switch(int tray_index, int old_temp = 210, int new_temp = 210);
    int command_ams_change_filament(bool load, std::string ams_id, std::string slot_id, int old_temp = 210, int new_temp = 210, std::optional<int> extruder_id = std::nullopt);
@@ -970,11 +970,7 @@ int ReselectMachineDialog::CaculateSwitcherDistribution(MachineObject* obj, cons
                const auto& can = ams.cans[j];
                auto id = getTrayID(obj, ams.ams_id, can.can_id);
                auto material = can.material_name;
-                if (can.is_empty || can.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY)
-                {
-                    material = L("Empty");
-                }
-                else if (can.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND ||
+                if (can.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND ||
                    can.material_state == AMSCanType::AMS_CAN_TYPE_BRAND ||
                    can.material_state == AMSCanType::AMS_CAN_TYPE_VIRTUAL)
                {
@@ -983,6 +979,10 @@ int ReselectMachineDialog::CaculateSwitcherDistribution(MachineObject* obj, cons
                        material = L("?");
                    }
                }
+                if (can.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY)
+                {
+                    material = L("Empty");
+                }

                auto itOK = std::find_if(posOK.begin(), posOK.end(), [&](const trayHelper& tray){
                    auto amsID = std::get<0>(tray);
@@ -1,105 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-
-#include <nlohmann/json.hpp>
-
-#include "libslic3r/ProjectTask.hpp"
-#include "DeviceManager.hpp"
-
-namespace Slic3r {
-namespace GUI {
-
-// True when the normalized ams_mapping2 carries any entry the agent's serializer
-// would put on the wire: every integer pair except the {255,255} unmatched
-// sentinel, external slots ({255,0}/{254,0}) included. This mirrors
-// OrcaPrinterAgent::build_filament_mapping exactly, so the GUI gate and the
-// agent gate agree; a mismatch lets an entry reach the agent and be refused late
-// with a generic publish error instead of the designed message.
-inline bool has_engaged_filament_mapping(const std::string& ams_mapping2)
-{
-    const nlohmann::json mapping = nlohmann::json::parse(ams_mapping2, nullptr, false);
-    if (mapping.is_discarded() || !mapping.is_array())
-        return false;
-    for (const auto& entry : mapping) {
-        if (!entry.is_object())
-            continue;
-        const auto ams_id_it  = entry.find("ams_id");
-        const auto slot_id_it = entry.find("slot_id");
-        if (ams_id_it == entry.end() || slot_id_it == entry.end())
-            continue;
-        if (!ams_id_it->is_number_integer() || !slot_id_it->is_number_integer())
-            continue;
-        if (ams_id_it->get<int>() == 255 && slot_id_it->get<int>() == 255)
-            continue; // unmatched/unused sentinel: the serializer drops it
-        return true;
-    }
-    return false;
-}
-
-// A device with no AMS units has a single source: the external spool. OrcaSlicer's
-// auto-mapping force-selects it for every filament (DevMapping.cpp), but that is not
-// a lane choice: keep it out of the send gate and off print.gcode_file.
-inline void drop_forced_external_selection(bool device_has_ams, std::string& ams_mapping2)
-{
-    if (!device_has_ams)
-        ams_mapping2.clear();
-}
-
-// A used filament with no target would be silently dropped from the wire
-// mapping, so the print must be refused rather than run the wrong material.
-// m_ams_mapping_result carries exactly the filaments the slice uses.
-inline bool has_used_filament_without_target(const std::vector<FilamentInfo>& result)
-{
-    for (const auto& f : result) {
-        if (f.get_ams_id() < 0 || f.get_slot_id() < 0)
-            return true;
-    }
-    return false;
-}
-
-// True when at least one used filament already has a target. The used-unmapped
-// refusal applies to a partially mapped print; a print with no mapping at all
-// is handled by the existing all-invalid send-path flow.
-inline bool has_any_mapped_target(const std::vector<FilamentInfo>& result)
-{
-    for (const auto& f : result) {
-        if (f.get_ams_id() >= 0 && f.get_slot_id() >= 0)
-            return true;
-    }
-    return false;
-}
-
-
-// Refusal reason for a printer agent that serializes lane selection into
-// print.gcode_file's per-print filament_mapping field.
-enum class MappingSendError {
-    none,        // no refusal; ams_mapping2 is normalized for send
-    unsupported, // a mapping is engaged but the connector did not advertise it
-    incomplete,  // a used filament has no target while others do
-};
-
-// Applies the send-time mapping policy and normalizes ams_mapping2 in place.
-// Agents that do not speak filament_mapping keep their legacy payload untouched.
-inline MappingSendError prepare_filament_mapping_for_send(MachineObject* obj,
-                                                          std::string& ams_mapping2,
-                                                          const std::vector<FilamentInfo>& mapping_result)
-{
-    if (!obj || !obj->printer_uses_filament_mapping())
-        return MappingSendError::none;
-
-    // A device with no AMS units has one source, the external spool:
-    // auto-mapping force-selects it, which is not a lane choice. Drop it before
-    // the capability gate so it cannot refuse a print nobody mapped.
-    drop_forced_external_selection(obj->HasAms(), ams_mapping2);
-
-    if (!obj->printer_supports_feature("filament_mapping") && has_engaged_filament_mapping(ams_mapping2))
-        return MappingSendError::unsupported;
-    if (has_any_mapped_target(mapping_result) && has_used_filament_without_target(mapping_result))
-        return MappingSendError::incomplete;
-    return MappingSendError::none;
-}
-
-} // namespace GUI
-} // namespace Slic3r
@@ -1160,8 +1160,7 @@ void GUI_App::post_init()
        m_agent->set_on_http_error_fn([this](CloudEvent event, unsigned int status, std::string body) {
            this->handle_http_error(status, body, event.provider);
        });
-        if (should_start_ssdp_discovery())
-            m_agent->start_discovery(true, false);
+        m_agent->start_discovery(true, false);
    }

    //update the plugin tips
@@ -4173,18 +4172,6 @@ std::string GUI_App::resolve_printer_agent_id(const std::string& stored_id) cons
    return (preset_bundle && preset_bundle->is_bbl_vendor()) ? BBL_PRINTER_AGENT_ID : ORCA_PRINTER_AGENT_ID;
 }

-bool GUI_App::should_start_ssdp_discovery()
-{
-    // Non-Orca agents (BBL, plugins) keep their own discovery; OrcaSonar only scans in the
-    // background when one of its machines is already configured, otherwise the popup drives it.
-    const std::string agent_id = resolve_printer_agent_id(
-        preset_bundle ? preset_bundle->printers.get_edited_preset().config.opt_string("printer_agent")
-                      : std::string());
-    if (agent_id != ORCA_PRINTER_AGENT_ID)
-        return true;
-    return m_device_manager && !m_device_manager->get_my_machine_list(ORCA_PRINTER_AGENT_ID).empty();
-}
-
 std::string GUI_App::canonical_printer_agent_id(const std::string& picked_id)
 {
    return picked_id == resolve_printer_agent_id("") ? std::string() : picked_id;
@@ -4256,8 +4243,7 @@ void GUI_App::switch_printer_agent()
    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": printer agent switched to " << effective_agent_id;

    // Start discovery so Python agents can populate the device list via SSDP callback
-    if (should_start_ssdp_discovery())
-        m_agent->start_discovery(true, false);
+    m_agent->start_discovery(true, false);

    // Auto-switch MachineObject (new agent has empty device_info, so always re-select)
    select_machine(effective_agent_id);
@@ -4876,12 +4862,6 @@ void GUI_App::recreate_GUI(const wxString &msg_name)
    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "recreate_GUI exit";
 }

-void GUI_App::system_info()
-{
-    //SysInfoDialog dlg;
-    //dlg.ShowModal();
-}
-
 void GUI_App::keyboard_shortcuts(ShortcutContext page, wxWindow* parent)
 {
    KBShortcutsDialog dlg(parent != nullptr ? parent : mainframe, page);
@@ -403,9 +403,6 @@ public:
    // Reconcile the live printer agent with the stored preset selection.
    void switch_printer_agent();

-    // Whether the background SSDP scan should run for the effective printer agent.
-    bool should_start_ssdp_discovery();
-
    std::string resolve_printer_agent_id(const std::string& stored_id) const;
    // ORCA TODO: in the future, bbl presets should specify "bbl" printer agent id
    // then, all resolve and canonical would just be ORCA<->""
@@ -522,7 +519,6 @@ public:
    void            check_printer_presets();

    void            recreate_GUI(const wxString& message);
-    void            system_info();
    void            keyboard_shortcuts(ShortcutContext page, wxWindow* parent = nullptr);   // the main frame when null
    void            troubleshoot();
    void            load_project(wxWindow *parent, wxString& input_file) const;
@@ -494,7 +494,17 @@ bool GLGizmoTextureDisplacement::on_init()
        {ctrl + _L("Mouse wheel"), m_desc["gap_area"]},
        toggle_wireframe_shortcut
    };
- 
+
+    // Both ways into the same input box on any slider in the panel: ImGui turns a slider into one when
+    // it is Ctrl+clicked or when it is given the keyboard focus, which is what the edit icon asks for.
+    m_desc["type_value"] = _L("Type an exact value into a slider");
+    m_shortcuts_sliders  = {
+        {ctrl + _L("Left mouse button"), m_desc["type_value"]},
+        {_L("Edit icon at a slider's right end"), m_desc["type_value"]},
+    };
+    for (std::vector<std::pair<wxString, wxString>> *list : {&m_shortcuts_brush, &m_shortcuts_bucket_fill, &m_shortcuts_gap_fill})
+        list->insert(list->end(), m_shortcuts_sliders.begin(), m_shortcuts_sliders.end());
+
    return true;
 }

@@ -1221,9 +1231,33 @@ indexed_triangle_set GLGizmoTextureDisplacement::patch_in_world(const indexed_tr
    return world;
 }

-std::vector<Vec2f> GLGizmoTextureDisplacement::compute_layer_vertex_uvs(const indexed_triangle_set     &local_patch,
-                                                                       const TextureDisplacementLayer &layer) const
+std::vector<Vec2f> GLGizmoTextureDisplacement::model_uv_corners(const indexed_triangle_set     &local_patch,
+                                                                const TextureDisplacementLayer &layer,
+                                                                const std::vector<int>         *patch_source) const
 {
+    const ModelVolume *mv = texture_volume();
+    if (layer.projection_method != TextureProjectionMethod::ModelUV || patch_source == nullptr || mv == nullptr ||
+        !mv->has_texture_uv())
+        return {};
+    // The channel is indexed against the volume's *local* mesh, and a uv is a coordinate in the
+    // texture rather than on the model, so unlike every projected method this never goes through
+    // patch_in_world() - there is no millimetre measurement here for a world scale to change.
+    std::vector<Vec2f> uv = compute_model_corner_uvs(mv->mesh().its, mv->texture_uv, local_patch, *patch_source);
+    for (Vec2f &p : uv)
+        // Already a uv: no tiling scale, no aspect correction - see apply_uv_transform().
+        p = apply_uv_transform(p, layer, 1.f, /* normalized_uv */ true);
+    return uv;
+}
+
+std::vector<Vec2f> GLGizmoTextureDisplacement::compute_layer_vertex_uvs(const indexed_triangle_set     &local_patch,
+                                                                       const TextureDisplacementLayer &layer,
+                                                                       const std::vector<int>         *patch_source) const
+{
+    if (layer.projection_method == TextureProjectionMethod::ModelUV)
+        // Collapsed to one per vertex the same way the unwrap is - a vertex has one position, so the
+        // displacement can only read one height for it.
+        return collapse_corner_uvs(local_patch, model_uv_corners(local_patch, layer, patch_source));
+
    // The bake maps the texture in world millimetres, so "Tile size (mm)" means the same thing on a
    // scaled instance as it does on an untouched one (see build_texture_displacement()). Everything
    // that has to agree with the bake - the fast preview's uvs, the checker/distortion overlays -
@@ -1283,8 +1317,11 @@ int GLGizmoTextureDisplacement::layer_projection_frame(const indexed_triangle_se
 }

 std::vector<Vec2f> GLGizmoTextureDisplacement::compute_layer_corner_uvs(const indexed_triangle_set     &local_patch,
-                                                                        const TextureDisplacementLayer &layer) const
+                                                                        const TextureDisplacementLayer &layer,
+                                                                        const std::vector<int>         *patch_source) const
 {
+    if (layer.projection_method == TextureProjectionMethod::ModelUV)
+        return model_uv_corners(local_patch, layer, patch_source);
    if (layer.projection_method == TextureProjectionMethod::LSCM) {
        const indexed_triangle_set patch  = patch_in_world(local_patch);
        const float                aspect = layer_texture_aspect(layer);
@@ -1294,7 +1331,7 @@ std::vector<Vec2f> GLGizmoTextureDisplacement::compute_layer_corner_uvs(const in
        return uv;
    }
    // Single-valued per point: fan the per-vertex result out over the corners.
-    const std::vector<Vec2f> per_vertex = compute_layer_vertex_uvs(local_patch, layer);
+    const std::vector<Vec2f> per_vertex = compute_layer_vertex_uvs(local_patch, layer, patch_source);
    if (per_vertex.size() != local_patch.vertices.size())
        return {};
    std::vector<Vec2f> corner(local_patch.indices.size() * 3);
@@ -1315,7 +1352,11 @@ void GLGizmoTextureDisplacement::rebuild_shaded_preview_mesh()
    // Uses the *live* selector (not the flushed model facet data), so this reflects an in-progress
    // stroke immediately rather than only once it ends - the point of this preview mode is to be
    // the fast, no-CPU-meshing one.
-    const indexed_triangle_set patch = m_triangle_selectors[0]->get_facets_strict(EnforcerBlockerType::ENFORCER);
+    // The source map comes along because a ModelUV layer's uvs are read per base-mesh triangle; every
+    // other mapping ignores it.
+    std::vector<int>           patch_source;
+    const indexed_triangle_set patch =
+        m_triangle_selectors[0]->get_facets_strict(EnforcerBlockerType::ENFORCER, &patch_source);
    if (patch.indices.empty())
        return;

@@ -1339,7 +1380,8 @@ void GLGizmoTextureDisplacement::rebuild_shaded_preview_mesh()
    // Per *corner*, not per vertex: the mesh below is flat (unshared) anyway, so each triangle can
    // carry its own chart's UVs - see compute_layer_corner_uvs().
    const TextureDisplacementLayer *active = active_layer();
-    std::vector<Vec2f> corner_uv = active != nullptr ? compute_layer_corner_uvs(patch, *active) : std::vector<Vec2f>{};
+    std::vector<Vec2f> corner_uv = active != nullptr ? compute_layer_corner_uvs(patch, *active, &patch_source) :
+                                                       std::vector<Vec2f>{};
    m_shaded_preview_uses_vertex_uv = corner_uv.size() == patch.indices.size() * 3;
    if (!m_shaded_preview_uses_vertex_uv)
        corner_uv.clear();
@@ -1996,7 +2038,9 @@ void GLGizmoTextureDisplacement::rebuild_uvcheck_mesh()
    const ModelVolume *mv = texture_volume();
    if (mv == nullptr || m_triangle_selectors.empty())
        return;
-    const indexed_triangle_set patch = m_triangle_selectors[0]->get_facets_strict(EnforcerBlockerType::ENFORCER);
+    std::vector<int>           patch_source; // only ModelUV reads it; see compute_layer_vertex_uvs()
+    const indexed_triangle_set patch =
+        m_triangle_selectors[0]->get_facets_strict(EnforcerBlockerType::ENFORCER, &patch_source);
    if (patch.indices.empty())
        return;
    // Everything below works in the *patch's* vertex space, not the mesh's. Those agree only until a
@@ -2010,7 +2054,7 @@ void GLGizmoTextureDisplacement::rebuild_uvcheck_mesh()

    // The checker samples wherever the projection puts it; the projections the shader can't
    // reconstruct (LSCM, ViewProjected) get a precomputed per-vertex uv, the rest project in-shader.
-    std::vector<Vec2f> uv       = compute_layer_vertex_uvs(patch, *layer);
+    std::vector<Vec2f> uv       = compute_layer_vertex_uvs(patch, *layer, &patch_source);
    const bool         have_uvs = uv.size() == patch.vertices.size();
    m_uvcheck_uses_vertex_uv    = have_uvs;
    m_uvcheck_projection_mode   = have_uvs ? 0 :
@@ -2019,7 +2063,7 @@ void GLGizmoTextureDisplacement::rebuild_uvcheck_mesh()
    // different uv in each island it borders, so the shared-vertex form drew one triangle per face from
    // a neighbouring island's placement. Only the *drawing* needs this; the distortion metric below is
    // a per-vertex average by construction and keeps using `uv`.
-    const std::vector<Vec2f> corner_uv = compute_layer_corner_uvs(patch, *layer);
+    const std::vector<Vec2f> corner_uv = compute_layer_corner_uvs(patch, *layer, &patch_source);
    const bool               have_corner_uvs = have_uvs && corner_uv.size() == patch.indices.size() * 3;

    // Per-vertex area distortion in [0,1] (0.5 == ideal), only when both requested and possible.
@@ -2295,6 +2339,8 @@ void GLGizmoTextureDisplacement::queue_preview_job()
    if (input.options.pipeline_v2)
        input.options.v2_max_triangles_k = 0;
    input.volume_to_world = texture_displacement_volume_to_world(*mv);
+    if (mv->has_texture_uv())
+        input.model_uv = mv->texture_uv;
    for (int i = 0; i < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++i)
        input.facets_data[size_t(i)] = mv->texture_displacement_facet(i).get_data();
    // Captured here rather than read in the handler: the palette is main-thread state, and the preview
@@ -3558,6 +3604,7 @@ const ModelVolume* GLGizmoTextureDisplacement::texture_volume() const

 void GLGizmoTextureDisplacement::update_model_object()
 {
+    store_panel_state();
    bool         updated = false;
    ModelObject *mo      = m_c->selection_info()->model_object();
    int          idx     = -1;
@@ -3593,6 +3640,24 @@ void GLGizmoTextureDisplacement::update_from_model_object(bool first_update)
 {
    wxBusyCursor wait;

+    // Opening the gizmo puts the panel back where it was left: the layer and the mode come off the
+    // volume, because they are the user's place in this model's stack, and the dock state off the
+    // application config, because it is about their window. Only on open - this also runs on an
+    // undo/redo and on a layer switch, where overriding what the user is doing now would be wrong.
+    if (first_update) {
+        if (const ModelVolume *mv = texture_volume(); mv != nullptr) {
+            const TextureDisplacementOptions &opts = mv->texture_displacement_options;
+            m_panel_mode = std::clamp(opts.panel_mode, 0, 1);
+            // Only if that slot still holds a layer: the stack can have been edited by anything that
+            // does not go through the panel, and a selection pointing at nothing shows an empty panel.
+            const auto &stack = mv->texture_displacement_layers;
+            if (std::any_of(stack.begin(), stack.end(),
+                            [&opts](const TextureDisplacementLayer &l) { return l.slot == opts.active_slot; }))
+                m_active_layer_slot = opts.active_slot;
+        }
+        m_undocked = wxGetApp().app_config->get_bool(UNDOCKED_CONFIG_KEY);
+    }
+
    const ModelObject *mo = m_c->selection_info()->model_object();
    m_triangle_selectors.clear();
    // The base keeps the last mesh a fill tool hovered, and render_painter_gizmo() reads it as a hover that is
@@ -3641,6 +3706,14 @@ void GLGizmoTextureDisplacement::update_from_model_object(bool first_update)
    rebuild_preview();
 }

+void GLGizmoTextureDisplacement::store_panel_state()
+{
+    if (ModelVolume *mv = texture_volume(); mv != nullptr) {
+        mv->texture_displacement_options.active_slot = m_active_layer_slot;
+        mv->texture_displacement_options.panel_mode  = m_panel_mode;
+    }
+}
+
 void GLGizmoTextureDisplacement::set_active_layer(int slot)
 {
    if (slot == m_active_layer_slot)
@@ -3649,6 +3722,7 @@ void GLGizmoTextureDisplacement::set_active_layer(int slot)
    // reflect - otherwise they would be silently lost.
    update_model_object();
    m_active_layer_slot = slot;
+    store_panel_state();
    update_from_model_object(false);
    // The on-canvas gizmo (if on) is anchored to whichever layer is active - keep it in sync
    // instead of leaving it pointing at the previous layer's (now stale) paint patch.
@@ -3676,10 +3750,13 @@ void GLGizmoTextureDisplacement::ensure_panel_icons()
        // Paint / Erase, brush cursor shape, mapping, tiling, placement and the dock toggle.
        "texture_displacement_add.svg", "texture_displacement_add_negative.svg", "circle_paint.svg",
        "menu_obj_sphere.svg", "menu_obj_cube.svg", "menu_obj_cylinder.svg", "texture_displacement_map_unwrap.svg",
-        "texture_displacement_map_view.svg", "texture_displacement_tile_repeat.svg", "menu_mirror_x.svg",
+        "texture_displacement_map_view.svg", "texture_displacement_map_model_uv.svg",
+        "texture_displacement_tile_repeat.svg", "menu_mirror_x.svg",
        "texture_displacement_adjust.svg", "canvas_drag.svg", "texture_displacement_move_up.svg",
        "texture_displacement_move_down.svg", "texture_displacement_drag.svg",
        "texture_displacement_select_all.svg", "texture_displacement_erase_all.svg",
+        // The "type a value instead" icon at the right end of every slider.
+        "edit.svg",
    };
    std::vector<std::string> paths;
    paths.reserve(names.size());
@@ -3723,6 +3800,11 @@ void GLGizmoTextureDisplacement::add_texture_layer()

    TextureDisplacementLayer layer;
    layer.slot = free_slot;
+    // A model that came with a UV channel is mapped by it. Re-unwrapping such a model throws away the
+    // layout it was authored against and can only be worse than using it, so the default follows the
+    // model rather than the other way round; the Mapping row still offers every other method.
+    if (mv->has_texture_uv())
+        layer.projection_method = TextureProjectionMethod::ModelUV;
    // Start the layer off on the first library texture rather than on nothing at all: a textureless
    // layer looks broken (painting on it appears to do nothing, because there is no height map to
    // displace by). The user swaps it for another from the layer's own picker.
@@ -4868,7 +4950,8 @@ ColorQuantizeFn GLGizmoTextureDisplacement::make_palette_quantizer(const std::ve

 TextureDisplacementPrepareResult GLGizmoTextureDisplacement::prepare_mesh(
    const indexed_triangle_set &base, const TextureDisplacementFacetsData &masks,
-    const std::vector<TextureDisplacementLayer> &layers, const TextureDisplacementPrepareParams &params,
+    const std::vector<TextureDisplacementLayer> &layers, const std::vector<Vec2f> &model_uv,
+    const TextureDisplacementPrepareParams &params,
    const TextureColorSettings &color_settings, const DisplacementProgressFn &progress,
    BakeStageRecorder *debug)
 {
@@ -4895,6 +4978,13 @@ TextureDisplacementPrepareResult GLGizmoTextureDisplacement::prepare_mesh(
    bool                          had_paint = false;
    for (const TriangleSelector::TriangleSplittingData &m : masks)
        had_paint = had_paint || TriangleSelector::has_facets(m, EnforcerBlockerType::ENFORCER);
+    // The model's own UV channel for whatever `mesh` currently is. Every stage below keeps the input's
+    // surface - it evens out, refines or cuts the triangles lying on it - so each corner reads its uv
+    // straight off `base`'s channel at its own position instead of being carried stage by stage, which
+    // would compound each stage's approximation. Untouched while nothing has replaced the mesh yet.
+    const auto uv_now = [&]() {
+        return (model_uv.empty() || !changed) ? model_uv : transfer_uv_channel(base, model_uv, mesh.its);
+    };
    if (!report(1))
        return out;

@@ -4941,9 +5031,11 @@ TextureDisplacementPrepareResult GLGizmoTextureDisplacement::prepare_mesh(
            // Feature-adaptive: sample the combined displacement so refinement follows texture
            // curvature. A null sampler (only LSCM layers, or nothing decodable) falls back to the
            // length baseline alone.
+            const std::vector<Vec2f> uv_stage = uv_now();
+            const std::vector<Vec2f> *uv_ptr  = uv_stage.empty() ? nullptr : &uv_stage;
            HeightFieldSampler sampler;
            if (params.subdiv_feature)
-                sampler = make_combined_displacement_sampler(mesh.its, layers, current);
+                sampler = make_combined_displacement_sampler(mesh.its, layers, current, uv_ptr);
            // Colour boundaries need triangles of their own - the chord test cannot see them, since
            // the height field is perfectly smooth across a change of filament.
            ColorFieldSampler color;
@@ -4951,7 +5043,7 @@ TextureDisplacementPrepareResult GLGizmoTextureDisplacement::prepare_mesh(
            // boundaries are refined where the bake will actually change filament.
            if (params.subdiv_color_edge_mm > 0.f && !color_settings.empty())
                color = make_combined_color_sampler(mesh.its, layers, current, make_palette_quantizer(color_settings.palette),
-                                                    make_palette_quantizer(color_settings.palette_pure));
+                                                    make_palette_quantizer(color_settings.palette_pure), uv_ptr);
            // The refinement follows perceived colour: a mix is one colour here, however the slicer
            // interleaves its filaments layer by layer.
            // "Min edge" is a feature-mode control (it is the floor the curvature test refines down
@@ -5010,8 +5102,10 @@ TextureDisplacementPrepareResult GLGizmoTextureDisplacement::prepare_mesh(
                std::vector<uint8_t> cut_region(mesh.its.indices.size(), 0);
                for (size_t i = 0; i < cut_region.size() && i < source.size(); ++i)
                    cut_region[i] = (region[size_t(source[i])] & REFINE_PAINTED) ? 1 : 0;
+                const std::vector<Vec2f> uv_refined = uv_now();
                const HeightFieldSampler refined_sampler =
-                    make_combined_displacement_sampler(mesh.its, layers, current);
+                    make_combined_displacement_sampler(mesh.its, layers, current,
+                                                        uv_refined.empty() ? nullptr : &uv_refined);
                std::vector<int>     cut_source;
                size_t               cuts = 0;
                indexed_triangle_set cut = cut_mesh_at_steps(mesh.its, cut_region, refined_sampler,
@@ -5035,6 +5129,7 @@ TextureDisplacementPrepareResult GLGizmoTextureDisplacement::prepare_mesh(
    if (!report(100) || !changed)
        return out; // an empty result: nothing to commit, which is not a failure

+    out.uv    = uv_now();
    out.mesh  = std::move(mesh.its);
    out.masks = std::move(current);
    return out;
@@ -5686,6 +5781,8 @@ void GLGizmoTextureDisplacement::queue_prepare(const TextureDisplacementPrepareP
    input.layers        = mv->texture_displacement_layers;
    input.params        = params;
    input.snapshot_name = snapshot_name;
+    if (mv->has_texture_uv())
+        input.model_uv = mv->texture_uv;
    if (params.subdiv_color_edge_mm > 0.f)
        input.color = color_settings_for(*mv);

@@ -5919,8 +6016,8 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
        }
        return s + "...";
    };
-    // Label column + a slider filling the rest of the row, value printed inside the track. Ctrl+click on
-    // any of these types a value in. `right_inset` keeps a layer card's inner padding.
+    // Label column + a slider filling the rest of the row, value printed inside the track.
+    // `right_inset` keeps a layer card's inner padding.
    const auto slider_label = [&](const wxString &label) {
        const float x0 = ImGui::GetCursorPosX();
        ImGui::AlignTextToFramePadding();
@@ -5928,17 +6025,107 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
        ImGui::SameLine();
        ImGui::SetCursorPosX(std::max(ImGui::GetCursorPosX(), x0 + label_w));
    };
+
+    // ---- Typed values on sliders ----
+    // Every slider in the panel goes through typed_slider(), so all of them take a number the same
+    // two ways: Ctrl+click on the track, or the edit icon at the right end for the same box without
+    // the modifier. Both end up in ImGui's own "temp input" mode - the icon only asks ImGui to focus
+    // the slider, which is what turns it into an input box (see SliderScalar) - so the parsing,
+    // the clamping and the Enter/click-away behaviour are ImGui's, not a second implementation.
+
+    // Retires a click whose row is no longer being drawn - the panel changed mode in between - so that
+    // it cannot fire later when that row comes back. Before any row is drawn, so a live one still wins.
+    if (!m_slider_type_request.empty() && ImGui::GetFrameCount() > m_slider_type_request_frame + 1)
+        m_slider_type_request.clear();
+
+    // Exactly as tall as the slider it sits beside, so it lines up with the track without the row
+    // having to be re-centred around it; icon_button() pads the glyph itself down to about 0.7 of this.
+    const float edit_icon_w = frame_h;
+    // What the slider's own width has to give up for the icon beside it.
+    const float edit_icon_room = edit_icon_w + gap_s;
+
+    // One end of a range, through the slider's own format, so the bounds in the tooltip read exactly
+    // like the value in the track. A parenthesised note in the format - "(auto)" - is dropped: it
+    // describes the current state, not the bound.
+    const auto fmt_bound = [](const char *format, auto v) {
+        char buf[64];
+        std::snprintf(buf, sizeof(buf), format, v);
+        std::string out(buf);
+        const size_t paren = out.find('(');
+        if (paren != std::string::npos)
+            out.erase(paren);
+        while (!out.empty() && out.back() == ' ')
+            out.pop_back();
+        return out;
+    };
+    const auto range_text = [](const std::string &lo, const std::string &hi) {
+        return Slic3r::format(_u8L("Range: %1% to %2%"), lo, hi);
+    };
+    const auto edit_icon_tip = [&](const std::string &range) {
+        return _u8L("Type a value instead of dragging. Ctrl+click on the slider does the same.") + "\n\n" + range;
+    };
+
+    // Draws `slider` at `item_w` (SetNextItemWidth's convention: negative measures back from the right
+    // edge, and the caller has already left edit_icon_room in it), then the edit icon. `tip` and the
+    // range go on both. Returns whatever the slider returned.
+    const auto typed_row = [&](const char *id, float item_w, const wxString &tip, const std::string &range,
+                               const std::function<bool()> &slider) -> bool {
+        // Deferred from the click a frame ago: SetKeyboardFocusHere() is a request for the *next*
+        // frame, so it has to be issued before the slider it names, not from the icon beside it.
+        if (m_slider_type_request == id) {
+            ImGui::SetKeyboardFocusHere();
+            m_slider_type_request.clear();
+            m_parent.set_as_dirty(); // the focus only lands on a frame that actually gets drawn
+        }
+        ImGui::SetNextItemWidth(item_w);
+        const bool changed = slider();
+        // AllowWhenDisabled: several of these rows are drawn inside disabled_begin(), and a greyed
+        // slider is exactly when the user needs to be told what it is and why it is not moving.
+        if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
+            wxString full = tip;
+            if (!full.IsEmpty())
+                full += "\n\n";
+            m_imgui->tooltip(full + from_u8(range), wrap_w);
+        }
+        // SameLine() puts the cursor back at the slider's own top (ItemSize records the Y the item was
+        // drawn at), so an icon of the same height lands on the track wherever the row placed it.
+        ImGui::SameLine(0.f, gap_s);
+        if (icon_button(int(ImGui::GetID(id)), "edit.svg", edit_icon_w, _L("Edit"), from_u8(edit_icon_tip(range)))) {
+            m_slider_type_request       = id;
+            m_slider_type_request_frame = ImGui::GetFrameCount();
+            m_parent.set_as_dirty(); // the next frame is where the request above is turned into focus
+        }
+        return changed;
+    };
+
+    // The two forms every slider in the panel is one of. They derive the range from the bounds they are
+    // already given, so no row states its bounds or its format twice and the tooltip cannot drift from
+    // the track. `item_w` is as typed_row() takes it.
+    const auto typed_slider = [&](const char *id, float item_w, float *v, float v_min, float v_max, const char *format,
+                                  bool log, const wxString &tip) -> bool {
+        return typed_row(id, item_w, tip, range_text(fmt_bound(format, v_min), fmt_bound(format, v_max)), [&] {
+            return ImGui::SliderFloat(id, v, v_min, v_max, format,
+                                      ImGuiSliderFlags_AlwaysClamp | (log ? ImGuiSliderFlags_Logarithmic : 0));
+        });
+    };
+    const auto typed_slider_int = [&](const char *id, float item_w, int *v, int v_min, int v_max, const char *format,
+                                      bool log, const wxString &tip) -> bool {
+        return typed_row(id, item_w, tip, range_text(fmt_bound(format, v_min), fmt_bound(format, v_max)), [&] {
+            return ImGui::SliderInt(id, v, v_min, v_max, format,
+                                    ImGuiSliderFlags_AlwaysClamp | (log ? ImGuiSliderFlags_Logarithmic : 0));
+        });
+    };
+
+    // Label column + the slider filling the rest of the row.
    const auto float_row = [&](const char *id, const wxString &label, float *v, float v_min, float v_max, const char *format,
-                               bool log, float right_inset) -> bool {
+                               bool log, float right_inset, const wxString &tip) -> bool {
        slider_label(label);
-        ImGui::SetNextItemWidth(-std::max(right_inset, 1.f));
-        return ImGui::SliderFloat(id, v, v_min, v_max, format, ImGuiSliderFlags_AlwaysClamp | (log ? ImGuiSliderFlags_Logarithmic : 0));
+        return typed_slider(id, -(std::max(right_inset, 1.f) + edit_icon_room), v, v_min, v_max, format, log, tip);
    };
    const auto int_row = [&](const char *id, const wxString &label, int *v, int v_min, int v_max, const char *format,
-                             float right_inset) -> bool {
+                             float right_inset, const wxString &tip) -> bool {
        slider_label(label);
-        ImGui::SetNextItemWidth(-std::max(right_inset, 1.f));
-        return ImGui::SliderInt(id, v, v_min, v_max, format, ImGuiSliderFlags_AlwaysClamp);
+        return typed_slider_int(id, -(std::max(right_inset, 1.f) + edit_icon_room), v, v_min, v_max, format, false, tip);
    };
    const auto layer_name = [](const TextureDisplacementLayer &l) {
        return l.name.empty() ? Slic3r::format(_u8L("Layer %1%"), l.slot + 1) : l.name;
@@ -5986,6 +6173,7 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                                   "not what you wanted and you know why."));
            if (clicked && !on) {
                m_panel_mode = m;
+                store_panel_state();
                if (!pro_mode()) {
                    // Leaving the subdivision preview open would strand a wireframe whose controls just
                    // disappeared, so close it as part of the switch.
@@ -6008,6 +6196,7 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                        _L("Detach this panel so it can be dragged anywhere over the 3D view, or dock it back beside "
                           "the toolbar.")))
            m_undocked = !m_undocked;
+            wxGetApp().app_config->set_bool(UNDOCKED_CONFIG_KEY, m_undocked);
    }
    ImGui::Separator();

@@ -6160,11 +6349,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
        const auto  centre_on_row = [&](float h) { ImGui::SetCursorPosY(row_y + std::round((icon_md - h) * 0.5f)); };
        vsep(icon_md);
        if (is_brush_mode) {
-            ImGui::SetNextItemWidth(std::max(1.f, row_end - ImGui::GetCursorPosX() - (3.f * gap_s + 1.f + 2.f * icon_sm)));
            centre_on_row(frame_h);
-            ImGui::SliderFloat("##cursor_radius", &m_cursor_radius, CursorRadiusMin, CursorRadiusMax, "%.2f mm",
-                               ImGuiSliderFlags_AlwaysClamp);
-            hover_tip(m_desc.at("cursor_size"));
+            typed_slider("##cursor_radius",
+                         std::max(1.f, row_end - ImGui::GetCursorPosX() - (3.f * gap_s + 1.f + 2.f * icon_sm) - edit_icon_room),
+                         &m_cursor_radius, CursorRadiusMin, CursorRadiusMax, "%.2f mm", false, m_desc.at("cursor_size"));
            vsep(icon_sm);
            const bool is_circle = m_cursor_type == TriangleSelector::CursorType::CIRCLE;
            centre_on_row(icon_sm);
@@ -6177,11 +6365,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                            _L("Sphere - paints only within a ball around the point under the cursor")))
                m_cursor_type = TriangleSelector::CursorType::SPHERE;
        } else if (is_area_mode) {
-            ImGui::SetNextItemWidth(std::max(1.f, row_end - ImGui::GetCursorPosX()));
            centre_on_row(frame_h);
-            ImGui::SliderFloat("##smart_fill_angle", &m_smart_fill_angle, SmartFillAngleMin, SmartFillAngleMax, "%.0f°",
-                               ImGuiSliderFlags_AlwaysClamp);
-            hover_tip(_u8L("Angle threshold - the fill stops at edges sharper than this"));
+            typed_slider("##smart_fill_angle", std::max(1.f, row_end - ImGui::GetCursorPosX() - edit_icon_room),
+                         &m_smart_fill_angle, SmartFillAngleMin, SmartFillAngleMax, "%.0f°", false,
+                         _L("Angle threshold - the fill stops at edges sharper than this"));
        } else {
            centre_on_row(frame_h);
            ImGui::AlignTextToFramePadding();
@@ -6451,16 +6638,25 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float

            // The three controls nearly every layer needs; everything else waits behind "More settings".
            // Depth and tile size are logarithmic, so both ends of their wide ranges stay usable.
-            m_preview_params_dirty |= float_row("##depth", _L("Depth"), &layer.depth_mm, 0.01f, 10.f, "%.3f mm", true, card_pad);
-            hover_tip(_u8L("Height of the relief: how far white in the texture lifts the surface, in "
-                           "millimetres. Black does not move it at all, unless Midlevel says otherwise."));
-            m_preview_params_dirty |= float_row("##tile_size", _L("Tile size"), &layer.tiling_scale, 0.2f, 200.f, "%.2f mm", true, card_pad);
-            hover_tip(_u8L("How wide one copy of the texture is on the model. Smaller repeats the pattern "
-                           "more often and makes its detail finer; with Tile off, this is the size of the "
-                           "single copy."));
-            m_preview_params_dirty |= float_row("##rotation", _L("Rotation"), &layer.rotation_deg, 0.f, 360.f, "%.0f°", false, card_pad);
-            hover_tip(_u8L("Turns the texture on the surface, in degrees - for lining a pattern up with an "
-                           "edge of the model."));
+            m_preview_params_dirty |= float_row("##depth", _L("Depth"), &layer.depth_mm, 0.01f, 10.f, "%.3f mm", true, card_pad,
+                                                _L("Height of the relief: how far white in the texture lifts the surface, in "
+                                                   "millimetres. Black does not move it at all, unless Midlevel says otherwise."));
+            // Mapped by the model's own UV layout there is no millimetre scale to set: the layout is the
+            // placement (see TextureProjectionMethod::ModelUV), so the slider would move nothing. The row
+            // states why rather than hiding: float_row()'s tooltip is shown for a disabled slider too.
+            const bool tile_size_na = layer.projection_method == TextureProjectionMethod::ModelUV;
+            m_imgui->disabled_begin(tile_size_na);
+            m_preview_params_dirty |= float_row("##tile_size", _L("Tile size"), &layer.tiling_scale, 0.2f, 200.f, "%.2f mm", true, card_pad,
+                                                tile_size_na ?
+                                                    _L("Mapped by the model's own UV layout, which is already the placement - one "
+                                                       "copy of the texture covers it exactly, so there is no tile size to set.") :
+                                                    _L("How wide one copy of the texture is on the model. Smaller repeats the pattern "
+                                                       "more often and makes its detail finer; with Tile off, this is the size of the "
+                                                       "single copy."));
+            m_imgui->disabled_end();
+            m_preview_params_dirty |= float_row("##rotation", _L("Rotation"), &layer.rotation_deg, 0.f, 360.f, "%.0f°", false, card_pad,
+                                                _L("Turns the texture on the surface, in degrees - for lining a pattern up with an "
+                                                   "edge of the model."));

            if (m_layer_expanded[size_t(layer.slot)]) {
                {
@@ -6475,22 +6671,22 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float

                // Midlevel: the height that means "don't move". At 0 the surface only ever bulges outwards;
                // at 0.5 mid-grey is neutral and darker texels cut inwards.
-                m_preview_params_dirty |= float_row("##midlevel", _L("Midlevel"), &layer.midlevel, 0.f, 10.f, "%.2f", false, card_pad);
-                hover_tip(_u8L("Which gray stays where the surface already is. At 0 the texture only pushes "
-                               "outwards; at 0.5 mid-gray stays put, so darker grays cut in and lighter ones "
-                               "still push out - one image both embosses and engraves.\n\n"
-                               "What cuts in has to fit: inside a sharp corner or through a thin wall, a deep "
-                               "cut can pass through the other side."));
+                m_preview_params_dirty |= float_row("##midlevel", _L("Midlevel"), &layer.midlevel, 0.f, 10.f, "%.2f", false, card_pad,
+                                                    _L("Which gray stays where the surface already is. At 0 the texture only pushes "
+                                                       "outwards; at 0.5 mid-gray stays put, so darker grays cut in and lighter ones "
+                                                       "still push out - one image both embosses and engraves.\n\n"
+                                                       "What cuts in has to fit: inside a sharp corner or through a thin wall, a deep "
+                                                       "cut can pass through the other side."));
                if (layer.midlevel > 0.f && layer.depth_mm > 1.f) {
                    ImGui::PushTextWrapPos(content_rx - card_pad);
                    m_imgui->warning_text(_L("Deep inward displacement may self-intersect."));
                    ImGui::PopTextWrapPos();
                }

-                m_preview_params_dirty |= float_row("##smoothing", _L("Smoothing"), &layer.smoothing, 0.f, 1.f, "%.2f", false, card_pad);
-                hover_tip(_u8L("Blurs the image before it is used, which rounds off hard steps and removes "
-                               "speckle from a noisy photo. Raise it if the relief looks harsh or grainy; it "
-                               "costs fine detail."));
+                m_preview_params_dirty |= float_row("##smoothing", _L("Smoothing"), &layer.smoothing, 0.f, 1.f, "%.2f", false, card_pad,
+                                                    _L("Blurs the image before it is used, which rounds off hard steps and removes "
+                                                       "speckle from a noisy photo. Raise it if the relief looks harsh or grainy; it "
+                                                       "costs fine detail."));

                // Edge fade: the relief flattens toward the boundary of the painted area.
                m_preview_params_dirty |= m_imgui->bbl_checkbox(_L("Edge fade") + "##edge_smoothing", layer.edge_smoothing);
@@ -6498,12 +6694,11 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                               "blends into the bare surface instead of stopping at a step."));
                ImGui::SameLine();
                m_imgui->disabled_begin(!layer.edge_smoothing);
-                ImGui::SetNextItemWidth(-card_pad);
-                m_preview_params_dirty |= ImGui::SliderFloat("##edge_amount", &layer.edge_smoothing_amount, 0.02f, 1.f, "%.2f",
-                                                             ImGuiSliderFlags_AlwaysClamp);
+                m_preview_params_dirty |= typed_slider("##edge_amount", -(card_pad + edit_icon_room),
+                                                       &layer.edge_smoothing_amount, 0.02f, 1.f, "%.2f", false,
+                                                       _L("How far in the fade reaches, as a share of the painted area. Small "
+                                                          "values soften a narrow band at the edge; 1 flattens almost all of it."));
                m_imgui->disabled_end();
-                hover_tip(_u8L("How far in the fade reaches, as a share of the painted area. Small values "
-                               "soften a narrow band at the edge; 1 flattens almost all of it."));

                // Invert and Colours share a row.
                {
@@ -6548,23 +6743,23 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                            // Every mix can become a filament slot, and there are only so many beside the
                            // physical filaments.
                            const int max_mixes = std::max(1, int(EnforcerBlockerType::ExtruderMax) - int(m_palette_filaments.size()));
-                            if (int_row("##color_mix_count", _L("Mixed colors"), &opts.color_mix_count, 1, max_mixes, "%d", card_pad))
+                            if (int_row("##color_mix_count", _L("Mixed colors"), &opts.color_mix_count, 1, max_mixes, "%d", card_pad,
+                                        _L("The most mixed filaments a bake may add. They are picked from the "
+                                           "texture's colors, and only the ones the bake actually uses are created.")))
                                m_preview_params_dirty = true;
-                            hover_tip(_u8L("The most mixed filaments a bake may add. They are picked from the "
-                                           "texture's colors, and only the ones the bake actually uses are created."));
                            // After the slider, so a change shows in the same frame.
                            ImGui::TextDisabled("%s", Slic3r::format(_u8L("%1% printable colors from %2% filaments"),
                                                                     int(cached_palette().size()), int(m_palette_filaments.size())).c_str());
                        }
-                        if (int_row("##color_despeckle", _L("Denoise"), &opts.color_despeckle, 0, 6, "%d", card_pad))
-                            m_preview_params_dirty = true;
-                        hover_tip(_u8L("Cleans up single stray triangles of the wrong color, which detail finer "
+                        if (int_row("##color_despeckle", _L("Denoise"), &opts.color_despeckle, 0, 6, "%d", card_pad,
+                                    _L("Cleans up single stray triangles of the wrong color, which detail finer "
                                       "than the mesh leaves behind. Raise it if the result looks speckled, "
-                                       "lower it if small features are being swallowed."));
+                                       "lower it if small features are being swallowed.")))
+                            m_preview_params_dirty = true;
                    }
                }

-                // Mapping, as five icons in TextureProjectionMethod's own order.
+                // Mapping, as one icon per TextureProjectionMethod, in the enum's own order.
                {
                    const float x0 = ImGui::GetCursorPosX();
                    ImGui::AlignTextToFramePadding();
@@ -6592,13 +6787,26 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                        { "texture_displacement_map_view.svg", _L("From view"),
                          _L("From view - projects straight onto the painted area from where you are looking, like a slide "
                             "projector.") },
+                        { "texture_displacement_map_model_uv.svg", _L("Model UV"),
+                          _L("Model UV - uses the texture coordinates the model itself came with, so a texture made for "
+                             "that model lands exactly where it was painted. Nothing is unwrapped, and Tile size does "
+                             "not apply: the model's own layout is the placement.") },
                    };
+                    // Only a volume that actually carries a UV channel can be mapped by it. Shown
+                    // greyed out rather than hidden, so the reason is visible instead of the control
+                    // simply being missing.
+                    const wxString model_uv_na =
+                        (mv != nullptr && mv->has_texture_uv()) ?
+                            wxString() :
+                            _L("This model carries no texture coordinates of its own. Only a model imported with a UV "
+                               "channel - a textured OBJ, say - can be mapped by them.");
                    for (int mi = 0; mi < int(IM_ARRAYSIZE(mappings)); ++mi) {
                        if (mi > 0)
                            ImGui::SameLine(0.f, gap_s);
                        const auto method = static_cast<TextureProjectionMethod>(mi);
+                        const wxString na = (method == TextureProjectionMethod::ModelUV) ? model_uv_na : wxString();
                        if (icon_toggle(830 + mi, mappings[mi].file, layer.projection_method == method, icon_sm, mappings[mi].label,
-                                        mappings[mi].tip) &&
+                                        mappings[mi].tip, na) &&
                            layer.projection_method != method) {
                            // Capture the current view the moment "From view" is chosen, so it does something
                            // sensible immediately rather than projecting from a stale/default direction.
@@ -6665,10 +6873,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                                    "gets the texture, and its border becomes the edge of the projection."));

                    if (projector_open) {
-                        if (int_row("##projector_opacity", _L("Opacity"), &m_projector_opacity, 20, 255, "%d", card_pad))
+                        if (int_row("##projector_opacity", _L("Opacity"), &m_projector_opacity, 20, 255, "%d", card_pad,
+                                    _L("How solid the frame window looks while you place it. Lower to see the "
+                                       "model through it; it does not affect the result.")))
                            m_projector_frame->set_opacity(m_projector_opacity);
-                        hover_tip(_u8L("How solid the frame window looks while you place it. Lower to see the "
-                                       "model through it; it does not affect the result."));

                        if (m_imgui->button(_u8L("Apply projection frame"))) {
                            const int painted_count = apply_projection_frame();
@@ -6728,18 +6936,33 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                    ImGui::SameLine();
                    ImGui::SetCursorPosX(std::max(ImGui::GetCursorPosX(), x0 + label_w));
                    const std::string blend_add      = _u8L_CONTEXT("Add", "Texture Displacement");
+                    const std::string blend_override  = _u8L_CONTEXT("Override", "Texture Displacement");
                    const std::string blend_subtract = _u8L_CONTEXT("Subtract", "Texture Displacement");
                    const std::string blend_multiply = _u8L_CONTEXT("Multiply", "Texture Displacement");
                    const std::string blend_divide   = _u8L("Divide");
-                    const char *blend_items[] = { blend_add.c_str(), blend_subtract.c_str(), blend_multiply.c_str(), blend_divide.c_str() };
+                    const char *blend_items[] = { blend_add.c_str(), blend_override.c_str(), blend_subtract.c_str(),
+                                                  blend_multiply.c_str(), blend_divide.c_str() };
+                    // The combo's order is the panel's, not the enum's - Override reads as the sibling of Add and
+                    // belongs next to it, while TextureBlendMode's numbering is fixed by what projects already
+                    // store. Hence the explicit mapping rather than a cast of the index.
+                    static const TextureBlendMode blend_modes[] = { TextureBlendMode::Add, TextureBlendMode::Override,
+                                                                    TextureBlendMode::Subtract, TextureBlendMode::Multiply,
+                                                                    TextureBlendMode::Divide };
+                    static_assert(IM_ARRAYSIZE(blend_items) == IM_ARRAYSIZE(blend_modes),
+                                  "every Blend entry needs its mode");
                    // The first layer has nothing before it to combine with - build_texture_displacement() makes it
                    // add regardless - so its combo shows Add and cannot be changed.
                    const bool base_layer = li == 0;
-                    int        blend_mode = base_layer ? 0 : static_cast<int>(layer.blend_mode);
+                    int        blend_mode = 0;
+                    if (!base_layer)
+                        for (int bi = 0; bi < int(IM_ARRAYSIZE(blend_modes)); ++bi)
+                            if (blend_modes[bi] == layer.blend_mode)
+                                blend_mode = bi;
                    ImGui::SetNextItemWidth(-(card_pad + gap_s + icon_sm));
                    m_imgui->disabled_begin(base_layer);
-                    if (scoped_combo("##blend_mode", &blend_mode, blend_items, IM_ARRAYSIZE(blend_items)) && !base_layer) {
-                        layer.blend_mode       = static_cast<TextureBlendMode>(blend_mode);
+                    if (scoped_combo("##blend_mode", &blend_mode, blend_items, IM_ARRAYSIZE(blend_items)) && !base_layer &&
+                        blend_mode >= 0 && blend_mode < int(IM_ARRAYSIZE(blend_modes))) {
+                        layer.blend_mode       = blend_modes[blend_mode];
                        m_preview_params_dirty = true;
                    }
                    m_imgui->disabled_end();
@@ -6747,10 +6970,11 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                        m_imgui->tooltip(base_layer ?
                                             _u8L("The base layer has nothing beneath it to combine with, so it always adds.") :
                                             _u8L("What this layer does where it overlaps the ones below. Add and "
-                                                  "Subtract pile relief on or carve it away. Multiply and Divide scale "
-                                                  "what is underneath, which turns this layer into a mask over it - "
-                                                  "there, Depth acts as a strength, and 1 mm leaves white areas "
-                                                  "untouched."),
+                                                  "Subtract pile relief on or carve it away. Override replaces them, "
+                                                  "so only this layer's relief is left where it is painted. Multiply "
+                                                  "and Divide scale what is underneath, which turns this layer into a "
+                                                  "mask over it - there, Depth acts as a strength, and 1 mm leaves "
+                                                  "white areas untouched."),
                                         wrap_w);

                    ImGui::SameLine(0.f, gap_s);
@@ -6969,57 +7193,57 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            // pattern can sample four points that all happen to land at similar heights, report no error,
            // and stall before refinement ever starts.
            if (float_row("##subdiv_target", m_subdivide_feature ? _L("Max edge") : _L("Target edge"), &m_subdivide_target_mm,
-                          0.001f, 20.f, "%.3f mm", true, 0.f))
+                          0.001f, 20.f, "%.3f mm", true, 0.f,
+                          m_subdivide_feature ?
+                              _L("No triangle in the painted area stays larger than this, even where the texture "
+                                 "is flat. Keep it near the size of the smallest feature you want to come out.") :
+                              _L("Triangles in the painted area are split until none is larger than this. Smaller "
+                                 "means finer detail and, fast, a lot more triangles.")))
                preview_live();
-            hover_tip(m_subdivide_feature ?
-                          _u8L("No triangle in the painted area stays larger than this, even where the texture "
-                               "is flat. Keep it near the size of the smallest feature you want to come out.") :
-                          _u8L("Triangles in the painted area are split until none is larger than this. Smaller "
-                               "means finer detail and, fast, a lot more triangles."));

            if (m_subdivide_feature) {
-                if (float_row("##subdiv_detail", _L("Detail"), &m_subdivide_detail_mm, 0.001f, 1.f, "%.3f mm", true, 0.f))
+                if (float_row("##subdiv_detail", _L("Detail"), &m_subdivide_detail_mm, 0.001f, 1.f, "%.3f mm", true, 0.f,
+                              _L("How far the mesh may sit from the shape the texture describes, in millimetres. "
+                                 "Smaller follows fine detail and costs triangles; larger only chases the big "
+                                 "features.")))
                    preview_live();
-                hover_tip(_u8L("How far the mesh may sit from the shape the texture describes, in millimetres. "
-                               "Smaller follows fine detail and costs triangles; larger only chases the big "
-                               "features."));
-                if (float_row("##subdiv_min", _L("Min edge"), &m_subdivide_min_edge_mm, 0.001f, 20.f, "%.3f mm", true, 0.f))
+                if (float_row("##subdiv_min", _L("Min edge"), &m_subdivide_min_edge_mm, 0.001f, 20.f, "%.3f mm", true, 0.f,
+                              _L("A floor on triangle size, so a sharp step in the texture cannot be chased "
+                                 "forever. Lower it for finer relief, raise it if the count runs away at hard "
+                                 "edges.")))
                    preview_live();
-                hover_tip(_u8L("A floor on triangle size, so a sharp step in the texture cannot be chased "
-                               "forever. Lower it for finer relief, raise it if the count runs away at hard "
-                               "edges."));
            }

            // Applies in both adaptive sub-modes: it is about the step the bake puts at the paint's edge, which
            // exists whether or not "Follow texture detail" is on. 0 turns the band off.
-            if (float_row("##subdiv_border", _L("Edge detail"), &m_subdivide_border_mm, 0.f, 5.f, "%.3f mm", false, 0.f))
+            if (float_row("##subdiv_border", _L("Edge detail"), &m_subdivide_border_mm, 0.f, 5.f, "%.3f mm", false, 0.f,
+                          _L("Triangle size along the outline of the painted area, where the relief drops back to the "
+                             "bare surface. Lower it if that rim looks jagged; it only costs triangles along the "
+                             "outline. 0 turns it off.")))
                preview_live();
-            hover_tip(_u8L("Triangle size along the outline of the painted area, where the relief drops back to the "
-                            "bare surface. Lower it if that rim looks jagged; it only costs triangles along the "
-                            "outline. 0 turns it off."));

            // Only worth showing when a layer is actually colouring: with no colour there is no boundary for it
            // to refine and the control would do nothing whatever it is set to.
            if (mv != nullptr && any_layer_colors(*mv)) {
-                if (float_row("##subdiv_color", _L("Color detail"), &m_subdivide_color_mm, 0.f, 5.f, "%.3f mm", false, 0.f))
+                if (float_row("##subdiv_color", _L("Color detail"), &m_subdivide_color_mm, 0.f, 5.f, "%.3f mm", false, 0.f,
+                              _L("Triangle size where two colors meet. Each triangle prints in one filament, so a "
+                                 "color edge can only be as sharp as the triangles along it - and nothing else "
+                                 "refines there, since the surface is flat across a change of color. 0 turns it off.")))
                    preview_live();
-                hover_tip(_u8L("Triangle size where two colors meet. Each triangle prints in one filament, so a "
-                                "color edge can only be as sharp as the triangles along it - and nothing else "
-                                "refines there, since the surface is flat across a change of color. 0 turns it off."));
            }

            ImGui::TextDisabled("%s", _u8L("Triangle budget: set with Triangles, below.").c_str());
            if (m_subdivide_editing && m_subdivide_preview_tris > 0)
                m_imgui->text(Slic3r::format(_u8L("Preview: %1% triangles"), m_subdivide_preview_tris));
        } else {
-            if (int_row("##subdiv_steps", _L("Steps"), &m_subdivide_count, 0, 5, "%d", 0.f)) {
+            if (int_row("##subdiv_steps", _L("Steps"), &m_subdivide_count, 0, 5, "%d", 0.f,
+                        _L("Splits every triangle of the model into four, this many times over. Each step "
+                           "quadruples the count - 3 turns 100 k triangles into 6.4 M - so prefer refining "
+                           "only the painted area unless you need the whole model finer."))) {
                if (m_subdivide_editing)
                    rebuild_subdivide_preview(); // a count of 0 clears the preview, it doesn't compute one
                m_parent.set_as_dirty();
            }
-            hover_tip(_u8L("Splits every triangle of the model into four, this many times over. Each step "
-                           "quadruples the count - 3 turns 100 k triangles into 6.4 M - so prefer refining "
-                           "only the painted area unless you need the whole model finer."));
        }

        {
@@ -7081,9 +7305,9 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                }
            m_remesh_target_edge_mm = cnt > 0 ? std::clamp(float(sum / double(cnt)), 0.1f, 20.f) : 1.f;
        }
-        float_row("##remesh_edge", _L("Target edge"), &m_remesh_target_edge_mm, 0.1f, 20.f, "%.2f mm", true, 0.f);
-        hover_tip(_u8L("Triangle size the whole model is rebuilt with, in millimetres. Displacement works best on an "
-                        "even mesh; this is what makes one out of an uneven import."));
+        float_row("##remesh_edge", _L("Target edge"), &m_remesh_target_edge_mm, 0.1f, 20.f, "%.2f mm", true, 0.f,
+                  _L("Triangle size the whole model is rebuilt with, in millimetres. Displacement works best on an "
+                     "even mesh; this is what makes one out of an uneven import."));

        m_imgui->bbl_checkbox(_L("Keep sharp edges") + "##remesh_sharp", m_remesh_keep_sharp_edges);
        hover_tip(_u8L("Holds hard edges and open borders in place while the rest is remeshed. Without it "
@@ -7091,11 +7315,10 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                       "a cube comes back with wobbly edges."));
        ImGui::SameLine();
        m_imgui->disabled_begin(!m_remesh_keep_sharp_edges);
-        ImGui::SetNextItemWidth(-1.f);
-        ImGui::SliderFloat("##remesh_sharp_angle", &m_remesh_sharp_angle_deg, 5.f, 90.f, "%.0f°", ImGuiSliderFlags_AlwaysClamp);
-        m_imgui->disabled_end();
-        hover_tip(_u8L("How sharp a fold has to be, in degrees, before the remesher treats it as an edge worth "
+        typed_slider("##remesh_sharp_angle", -(1.f + edit_icon_room), &m_remesh_sharp_angle_deg, 5.f, 90.f, "%.0f°", false,
+                     _L("How sharp a fold has to be, in degrees, before the remesher treats it as an edge worth "
                        "keeping. Lower protects more of the model's shape; higher rebuilds more of it evenly."));
+        m_imgui->disabled_end();

        m_imgui->disabled_begin(mv == nullptr || busy);
        if (ImGui::Button(_u8L("Remesh").c_str()))
@@ -7123,16 +7346,16 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                            "on a layer is a different thing: it blurs the image before it is used."));
            if (opts.smooth_enabled) {
                float percent = opts.smooth_strength * 100.f;
-                if (float_row("##dispsmooth", _L_CONTEXT("Strength", "Texture Displacement"), &percent, 1.f, 100.f, "%.0f %%", false, 0.f)) {
+                if (float_row("##dispsmooth", _L_CONTEXT("Strength", "Texture Displacement"), &percent, 1.f, 100.f, "%.0f %%", false, 0.f,
+                              _L("How far each pass pulls a vertex towards its neighbours. High values round the "
+                                 "relief off quickly; low values need more passes but keep more of the detail."))) {
                    opts.smooth_strength   = std::clamp(percent / 100.f, 0.01f, 1.f);
                    m_preview_params_dirty = true;
                }
-                hover_tip(_u8L("How far each pass pulls a vertex towards its neighbours. High values round the "
-                               "relief off quickly; low values need more passes but keep more of the detail."));
-                if (int_row("##dispsmoothit", _L("Passes"), &opts.smooth_iterations, 1, 10, "%d", 0.f))
+                if (int_row("##dispsmoothit", _L("Passes"), &opts.smooth_iterations, 1, 10, "%d", 0.f,
+                            _L("How many smoothing passes to run. More passes spread the smoothing further across "
+                               "the surface; Strength decides how much each one moves.")))
                    m_preview_params_dirty = true;
-                hover_tip(_u8L("How many smoothing passes to run. More passes spread the smoothing further across "
-                                "the surface; Strength decides how much each one moves."));

                m_preview_params_dirty |= m_imgui->bbl_checkbox(_L("Ignore outer ring"), opts.smooth_skip_border);
                hover_tip(_u8L("Keeps the outer ring of the painted area out of the smoothing. Its neighbours "
@@ -7175,16 +7398,16 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            int        shown_k     = auto_budget ? v2_recommendation(*mv).budget_k : opts.v2_max_triangles_k;
            m_imgui->disabled_begin(auto_budget);
            // TRN Slider value: %d is the triangle budget in thousands
-            if (int_row("##v2budget", _L("Budget"), &shown_k, 0, 4000, auto_budget ? _u8L("%d k (auto)").c_str() : "%d k", 0.f)) {
+            if (int_row("##v2budget", _L("Budget"), &shown_k, 0, 4000, auto_budget ? _u8L("%d k (auto)").c_str() : "%d k", 0.f,
+                        _L("How many thousand triangles this bake may spend on the area you painted. "
+                           "Relief already baked into the rest of the model is kept on top of it, so a "
+                           "second bake somewhere else gets the same budget as the first. Raise it if the "
+                           "warning below Resolution says the detail will not fit; 0 keeps every triangle "
+                           "the refinement produced, however many that is."))) {
                opts.v2_max_triangles_k = shown_k;
                m_preview_params_dirty  = true;
            }
            m_imgui->disabled_end();
-            hover_tip(_u8L("How many thousand triangles this bake may spend on the area you painted. "
-                           "Relief already baked into the rest of the model is kept on top of it, so a "
-                           "second bake somewhere else gets the same budget as the first. Raise it if the "
-                           "warning below Resolution says the detail will not fit; 0 keeps every triangle "
-                           "the refinement produced, however many that is."));
        }
        if (SHOW_PIPELINE_DEV_CONTROLS && opts.pipeline_v2) {
            // Keeping the relief above the plate is not a checkbox: it is unconditional, in both pipelines
@@ -7291,26 +7514,28 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                           "default. Untick to set both yourself - worth doing for a texture much finer or "
                           "much coarser than the part it sits on."));
            ImGui::SameLine();
-            ImGui::SetNextItemWidth(x0 + panel_w - ImGui::GetCursorPosX());
            float shown = auto_res ? rec.edge_mm : opts.v2_refine_mm;
+            // Held in a local: the format outlives the call that reads it, and the slider and the
+            // range in its tooltip are then formatted the same way.
+            const std::string v2edge_format = auto_res ? _u8L("%.2f mm (auto)") : std::string("%.2f mm");
+            const wxString    v2edge_tip =
+                auto_res && rec.edge_mm > 0.f ?
+                    from_u8(Slic3r::format(_u8L("Chosen from the size of the model: %1$.2f mm triangles, "
+                                                "budget %2% k. Untick Auto to set them yourself."),
+                                           rec.edge_mm, rec.budget_k)) :
+                    _L("How fine the mesh is made under the paint, in millimetres. It has to be "
+                       "smaller than the detail you want out of the texture - a 0.5 mm groove needs "
+                       "triangles well under 0.5 mm. Smaller costs triangles fast: halving it needs "
+                       "four times as many, and once they no longer fit the budget the bake simplifies "
+                       "back down and the detail goes with it.");
            m_imgui->disabled_begin(busy || auto_res);
-            if (ImGui::SliderFloat("##v2edge", &shown, 0.02f, 2.f, auto_res ? _u8L("%.2f mm (auto)").c_str() : "%.2f mm",
-                                   ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic)) {
+            if (typed_slider("##v2edge", x0 + panel_w - ImGui::GetCursorPosX() - edit_icon_room, &shown, 0.02f, 2.f,
+                             v2edge_format.c_str(), true, v2edge_tip)) {
                opts.v2_refine_mm      = shown;
                m_preview_params_dirty = true;
                m_parent.set_as_dirty();
            }
            m_imgui->disabled_end();
-            if (auto_res && rec.edge_mm > 0.f)
-                hover_tip(Slic3r::format(_u8L("Chosen from the size of the model: %1$.2f mm triangles, "
-                                              "budget %2% k. Untick Auto to set them yourself."),
-                                          rec.edge_mm, rec.budget_k));
-            else
-                hover_tip(_u8L("How fine the mesh is made under the paint, in millimetres. It has to be "
-                               "smaller than the detail you want out of the texture - a 0.5 mm groove needs "
-                               "triangles well under 0.5 mm. Smaller costs triangles fast: halving it needs "
-                               "four times as many, and once they no longer fit the budget the bake simplifies "
-                               "back down and the detail goes with it."));

            // What this resolution costs over what is painted, against what the budget allows. Refining
            // past the budget is not an error - the bake simplifies back down to it - but the result
@@ -7342,18 +7567,17 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            m_imgui->text(_L("Triangles"));
            ImGui::SameLine();
            ImGui::SetCursorPosX(std::max(ImGui::GetCursorPosX(), x0 + label_w));
-            ImGui::SetNextItemWidth(x0 + panel_w - ImGui::GetCursorPosX());
            m_imgui->disabled_begin(busy);
-            if (ImGui::SliderInt("##subdivbudget", &m_subdivide_budget_k, 10, 2000, "+%d k",
-                                 ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic)) {
+            if (typed_slider_int("##subdivbudget", x0 + panel_w - ImGui::GetCursorPosX() - edit_icon_room,
+                                 &m_subdivide_budget_k, 10, 2000, "+%d k", true,
+                                 _L("How many thousand triangles the refinement may add to the model. The triangle "
+                                    "that fits worst is always split first, so even a run that spends the lot has "
+                                    "spent it where it shows most. Raise it if the relief still looks coarse."))) {
                if (m_subdivide_editing)
                    rebuild_subdivide_preview();
                m_parent.set_as_dirty();
            }
            m_imgui->disabled_end();
-            hover_tip(_u8L("How many thousand triangles the refinement may add to the model. The triangle "
-                           "that fits worst is always split first, so even a run that spends the lot has "
-                           "spent it where it shows most. Raise it if the relief still looks coarse."));
        }

        const float button_h = std::round(frame_h * 1.25f);
@@ -7372,7 +7596,7 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
            : m_tool_type == ToolType::SMART_FILL  ? m_shortcuts_bucket_fill 
            : m_tool_type == ToolType::BRUSH       ? m_shortcuts_brush 
            : m_tool_type == ToolType::GAP_FILL    ? m_shortcuts_gap_fill 
-            : std::vector<std::pair<wxString, wxString>>{};
+            : m_shortcuts_sliders; // the sliders are there whether or not a painting tool is

        ImGui::SetCursorPosY(row_y + (row_h - icon_h) * .5f); // center vertically
        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(int(m_imgui->scaled(.5f)), style.ItemSpacing.y));
@@ -61,6 +61,12 @@ public:
    static TextureDisplacementPrepareResult prepare_mesh(const indexed_triangle_set                  &base,
                                                         const TextureDisplacementFacetsData         &masks,
                                                         const std::vector<TextureDisplacementLayer> &layers,
+                                                         // `base`'s own UV channel, when it has one
+                                                         // (ModelVolume::texture_uv). Resampled onto
+                                                         // the result and reported back in it, and fed
+                                                         // to the samplers so a ModelUV layer drives
+                                                         // the refinement through its own layout.
+                                                         const std::vector<Vec2f>                    &model_uv,
                                                         const TextureDisplacementPrepareParams      &params,
                                                         const TextureColorSettings                  &color_settings,
                                                         const DisplacementProgressFn                &progress,
@@ -262,6 +268,9 @@ private:
    // Standard is active so what Preview shows is always what Bake will do. Returns true if it actually
    // changed something, so the caller can invalidate the preview.
    bool apply_standard_mode_presets(ModelVolume *mv);
+    // Copies the panel's own state (active layer, Standard/Pro) onto the volume, so the project file
+    // can carry it. Cheap and idempotent - called wherever either of the two changes.
+    void store_panel_state();
    // Standard mode's Bake: remesh to an even density, refine where the texture bends, then displace.
    // The order matters and is the whole reason this is one button - a height map can only move
    // existing vertices, so the mesh has to be prepared first, and remeshing after painting would drop
@@ -404,6 +413,12 @@ private:
    // Per slot: whether the layer's card shows every setting or only Depth, Tile size and Rotation.
    // Panel state only, not saved with the project.
    std::array<bool, TEXTURE_DISPLACEMENT_MAX_LAYERS> m_layer_expanded{};
+    // The slider whose edit icon was just clicked, as its ImGui id, and the frame it was clicked on.
+    // The row acts on it on the next frame - ImGui's keyboard-focus request only takes effect a frame
+    // later - and clears it; the frame number is what retires a request whose row has gone off screen
+    // in the meantime. Panel state only, not saved with the project.
+    std::string m_slider_type_request;
+    int         m_slider_type_request_frame = 0;

    // "Adjust Texture" mode: instead of painting, dragging an on-canvas handle changes the active
    // layer's offset. The handle is a flat panel lying in the paint patch's own tangent plane
@@ -818,18 +833,31 @@ private:
    // Merges chart `b`'s join group into chart `a`'s (materialising `groups` to `chart_count` first).
    static void      join_island_groups(std::vector<int> &groups, int a, int b, int chart_count);
    // Final per-vertex texture uv for the projections the shader can't reconstruct itself - LSCM (an
-    // unwrap) and ViewProjected (a projector plane the shader doesn't know). One entry per patch/base
-    // vertex, already through apply_uv_transform(). Empty for Triplanar/Cylindrical/Spherical, which
-    // the shader projects on its own. Shared by the shaded preview and the UV-check overlay.
+    // unwrap), ModelUV (the model's own channel) and ViewProjected (a projector plane the shader
+    // doesn't know). One entry per patch/base vertex, already through apply_uv_transform(). Empty for
+    // Triplanar/Cylindrical/Spherical, which the shader projects on its own. Shared by the shaded
+    // preview and the UV-check overlay.
+    //
+    // `patch_source` maps each patch triangle back to its base-mesh triangle
+    // (TriangleSelector::get_facets_strict()'s out_source). Only ModelUV needs it - its channel is per
+    // base triangle - and without it a ModelUV layer reports no uvs and the preview falls back.
    std::vector<Vec2f> compute_layer_vertex_uvs(const indexed_triangle_set &patch,
-                                                const TextureDisplacementLayer &layer) const;
+                                                const TextureDisplacementLayer &layer,
+                                                const std::vector<int> *patch_source = nullptr) const;
    // The same, but three UVs per patch triangle (corner 0..2 of triangle i at 3i..3i+2). This is what
    // the flat, unshared-vertex preview meshes actually want: under LSCM a seam vertex has a different
    // UV in each island it borders, so collapsing to one per vertex handed a triangle at an unjoined
    // seam its neighbour's placement - one visibly skewed triangle per face. Every other projection is
    // single-valued per point, so there a corner's UV is just its vertex's.
    std::vector<Vec2f> compute_layer_corner_uvs(const indexed_triangle_set &patch,
-                                                const TextureDisplacementLayer &layer) const;
+                                                const TextureDisplacementLayer &layer,
+                                                const std::vector<int> *patch_source = nullptr) const;
+    // The model's own channel over `local_patch`, already through apply_uv_transform() - three per
+    // patch triangle. Empty when the volume has no channel, or when `patch_source` is missing. Shared
+    // by the two functions above so the per-vertex and per-corner forms can never disagree.
+    std::vector<Vec2f> model_uv_corners(const indexed_triangle_set &local_patch,
+                                        const TextureDisplacementLayer &layer,
+                                        const std::vector<int> *patch_source) const;
    // The in-shader projection for `layer` (0 Triplanar, 1 Cylindrical, 2 Spherical) plus, for the two
    // wrapping ones, the patch centroid and cylinder axis they wrap around - in the texture frame the
    // shaders project in. Taken from the bake's own texture_displacement_patch_frame(), so a preview
@@ -971,9 +999,12 @@ private:
    PatchUnwrap m_uv_editor_unwrap;

    // When set, the panel is a free-floating window the user can drag anywhere (with a title bar to
-    // grab), instead of being pinned to the right of the gizmo toolbar. Persisted across gizmo
-    // open/close within a session, so the choice sticks while working.
+    // grab), instead of being pinned to the right of the gizmo toolbar. Kept in the application
+    // config rather than in the project: it describes the user's window, not the model, so opening
+    // someone else's project must not move their panel.
    bool m_undocked = false;
+    // The config key behind m_undocked.
+    static constexpr const char *UNDOCKED_CONFIG_KEY = "texture_displacement_panel_undocked";

    // Smooth scrolling for the panel body (everything between the header and the pinned Bake footer).
    // ImGui jumps a fixed number of lines per wheel notch, which on tall layer cards reads as a hard
@@ -1016,6 +1047,9 @@ private:
    std::vector<std::pair<wxString, wxString>> m_shortcuts_bucket_fill;
    // Contains all shortcuts in the format of {shortcut, description}, e.g. {alt + _L("Left mouse button"), _L("Part_selection")}
    std::vector<std::pair<wxString, wxString>> m_shortcuts_gap_fill;
+    // The two ways every slider in the panel takes a typed value. They hold whatever tool is selected,
+    // so they are tacked onto each of the lists above and stand on their own when no tool is active.
+    std::vector<std::pair<wxString, wxString>> m_shortcuts_sliders;

    // Icons for the panel's icon buttons (tools, views, mapping, tiling, layer actions). Loaded through IconManager with
    // the same colour/monochrome variants the main toolbar uses, so an inactive button shows the icon in
@@ -1,16 +1,13 @@
 #include "ImageGrid.h"
 #include "Printer/PrinterFileSystem.h"
-#include "Printer/BambuFileGridModel.h"
 #include "wxExtensions.hpp"
 #include "Widgets/Label.hpp"
 #include "I18N.hpp"
 #include "GUI_App.hpp"
 #include "GUI.hpp"

-#include <slic3r/GUI/Printer/IFileGridModel.h>
 #include <utility>
 #include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared_object.hpp>
 #include <wx/colour.h>
 #include <cstddef>
 #include <wx/dcclient.h>
@@ -79,25 +76,19 @@ ImageGrid::ImageGrid(wxWindow * parent)

 void ImageGrid::SetFileSystem(boost::shared_ptr<PrinterFileSystem> file_sys)
 {
+    if (m_file_sys) {
+        m_file_sys->Unbind(EVT_MODE_CHANGED, &ImageGrid::changedEvent, this);
+        m_file_sys->Unbind(EVT_FILE_CHANGED, &ImageGrid::changedEvent, this);
+        m_file_sys->Unbind(EVT_THUMBNAIL, &ImageGrid::changedEvent, this);
+        m_file_sys->Unbind(EVT_DOWNLOAD, &ImageGrid::changedEvent, this);
+    }
    m_file_sys = file_sys;
-    m_model.reset();
-    if (file_sys) {
-        m_model = boost::make_shared<BambuFileGridModel>(file_sys);
-        m_model->SetChangeHandler([this](FileGridChange c) { onModelChange(c); });
+    if (m_file_sys) {
+        m_file_sys->Bind(EVT_MODE_CHANGED, &ImageGrid::changedEvent, this);
+        m_file_sys->Bind(EVT_FILE_CHANGED, &ImageGrid::changedEvent, this);
+        m_file_sys->Bind(EVT_THUMBNAIL, &ImageGrid::changedEvent, this);
+        m_file_sys->Bind(EVT_DOWNLOAD, &ImageGrid::changedEvent, this);
    }
-    m_row_count = 0;
-    m_col_count = 1;
-    m_row_offset = 0;
-    m_scroll_offset = 0;
-    UpdateFileSystem();
-}
-
-void ImageGrid::SetModel(boost::shared_ptr<IFileGridModel> model)
-{
-    m_file_sys.reset();
-    m_model = std::move(model);
-    if (m_model)
-        m_model->SetChangeHandler([this](FileGridChange c) { onModelChange(c); });
    m_row_count = 0;
    m_col_count = 1;
    m_row_offset = 0;
@@ -107,7 +98,7 @@ void ImageGrid::SetModel(boost::shared_ptr<IFileGridModel> model)

 void ImageGrid::SetStatus(ScalableBitmap const & icon, wxString const &msg)
 {
-    int code     = m_model ? m_model->GetLastError() : 1;
+    int code     = m_file_sys ? m_file_sys->GetLastError() : 1;
    m_status_icon = icon;
    m_status_msg = wxString::Format(msg, code);
    BOOST_LOG_TRIVIAL(info) << "ImageGrid::SetStatus: " << m_status_msg.ToUTF8().data();
@@ -116,26 +107,26 @@ void ImageGrid::SetStatus(ScalableBitmap const & icon, wxString const &msg)

 void Slic3r::GUI::ImageGrid::SetFileType(int type, std::string const &storage)
 {
-    if (!m_model)
+    if (!m_file_sys)
        return;
-    m_model->SetFileType((FileGridType) type, storage);
+    m_file_sys->SetFileType((PrinterFileSystem::FileType) type, storage);
 }

 void Slic3r::GUI::ImageGrid::SetGroupMode(int mode)
 {
-    if (!m_model)
+    if (!m_file_sys)
        return;
-    if (m_model->GetCount() == 0) {
-        m_model->SetGroupMode((FileGridGroup) mode);
+    if (m_file_sys->GetCount() == 0) {
+        m_file_sys->SetGroupMode((PrinterFileSystem::GroupMode) mode);
        return;
    }
    wxSize size = GetClientSize();
    int index = (m_row_offset + 1 < m_row_count || m_row_count == 0) 
        ? m_row_offset / 4 * m_col_count 
-        : ((m_model->GetCount() + m_col_count - 1) / m_col_count - (size.y + m_border_size.GetHeight() - 1) / m_cell_size.GetHeight()) * m_col_count;
-    time_t time = m_model->GetFile(index).time;
-    m_model->SetGroupMode((FileGridGroup) mode);
-    index = m_model->GetIndexAtTime(time);
+        : ((m_file_sys->GetCount() + m_col_count - 1) / m_col_count - (size.y + m_border_size.GetHeight() - 1) / m_cell_size.GetHeight()) * m_col_count;
+    auto & file = m_file_sys->GetFile(index);
+    m_file_sys->SetGroupMode((PrinterFileSystem::GroupMode) mode);
+    index = m_file_sys->GetIndexAtTime(file.time);
    // UpdateFileSystem(); call by changed event
    m_row_offset = index / m_col_count * 4;
    if (m_row_offset >= m_row_count)
@@ -146,8 +137,8 @@ void Slic3r::GUI::ImageGrid::SetGroupMode(int mode)
 void Slic3r::GUI::ImageGrid::SetSelecting(bool selecting)
 {
    m_selecting = selecting;
-    if (m_model)
-        m_model->SelectAll(false);
+    if (m_file_sys)
+        m_file_sys->SelectAll(false);
    Refresh();
 }

@@ -175,14 +166,14 @@ void Slic3r::GUI::ImageGrid::Rescale()
 void Slic3r::GUI::ImageGrid::Select(size_t index)
 {
    if (m_selecting) {
-        m_model->ToggleSelect(index);
+        m_file_sys->ToggleSelect(index);
        Refresh();
        return;
    }
-    if (m_model->GetGroupMode() == FileGridGroup::All) {
+    if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE) {
        return;
    }
-    index = m_model->EnterSubGroup(index);
+    index = m_file_sys->EnterSubGroup(index);
    // UpdateFileSystem(); call by changed event
    m_row_offset = index / m_col_count * 4;
    if (m_row_offset >= m_row_count)
@@ -202,9 +193,9 @@ void Slic3r::GUI::ImageGrid::DoAction(size_t index, int action)

 void Slic3r::GUI::ImageGrid::UpdateFileSystem()
 {
-    if (!m_model) return;
-    if (m_model->GetFileType() < FileGridType::Model) {
-        if (m_model->GetGroupMode() == FileGridGroup::All) {
+    if (!m_file_sys) return;
+    if (m_file_sys->GetFileType() < PrinterFileSystem::F_MODEL) {
+        if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE) {
            m_cell_size.Set(396, 228);
            m_border_size.Set(384, 216);
        }
@@ -225,10 +216,10 @@ void Slic3r::GUI::ImageGrid::UpdateFileSystem()

 void ImageGrid::UpdateLayout()
 {
-    if (!m_model) return;
+    if (!m_file_sys) return;
    wxSize size = GetClientSize();
    wxSize title_mask_size{0, 60 * em_unit(this) / 10};
-    if (m_model->GetGroupMode() == FileGridGroup::All) {
+    if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE) {
        title_mask_size.y = 20 * em_unit(this) / 10;
        size.y -= title_mask_size.y;
    }
@@ -236,7 +227,7 @@ void ImageGrid::UpdateLayout()
    int cell_height = m_cell_size.GetHeight();
    int ncol = (size.GetWidth() - cell_width + m_border_size.GetWidth()) / cell_width;
    if (ncol <= 0) ncol = 1;
-    int total_height = (m_model->GetCount() + ncol - 1) / ncol * cell_height + cell_height - m_border_size.GetHeight();
+    int total_height = (m_file_sys->GetCount() + ncol - 1) / ncol * cell_height + cell_height - m_border_size.GetHeight();
    int nrow = (total_height - size.GetHeight() + cell_height / 4 - 1) / (cell_height / 4);
    m_row_offset = m_row_offset * m_col_count / ncol;
    m_col_count = ncol;
@@ -245,7 +236,7 @@ void ImageGrid::UpdateLayout()
        m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1;
    m_scroll_offset = 0;
    // create mask
-    if (m_model->GetGroupMode() == FileGridGroup::All) {
+    if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE) {
        title_mask_size.x = (m_col_count - 1) * m_cell_size.GetWidth() + m_border_size.GetWidth();
    }
    else {
@@ -261,7 +252,7 @@ void ImageGrid::UpdateLayout()

 void Slic3r::GUI::ImageGrid::UpdateFocusRange()
 {
-    if (!m_model) return;
+    if (!m_file_sys) return;
    wxSize  size = GetClientSize();
    wxPoint off;
    int     index = firstItem(size, off);
@@ -270,21 +261,15 @@ void Slic3r::GUI::ImageGrid::UpdateFocusRange()
        count += m_col_count;
        off.y += m_cell_size.y;
    }
-    m_model->SetFocusRange(index, count);
-}
-
-bool Slic3r::GUI::ImageGrid::hasSecondAction(const FileGridCard &card) const
-{
-    return m_show_download || card.downloading ||
-           (m_model->GetFileType() == FileGridType::Model && card.printable);
+    m_file_sys->SetFocusRange(index, count);
 }

 std::pair<int, size_t> Slic3r::GUI::ImageGrid::HitTest(wxPoint const &pt)
 {
-    if (!m_model)
+    if (!m_file_sys)
        return {HIT_NONE, -1};
    wxSize size  = GetClientSize();
-    if (m_model->GetCount() == 0) {
+    if (m_file_sys->GetCount() == 0) {
        if (wxRect({0, 0}, m_border_size).CenterIn(wxRect({0, 0}, size)).Contains(pt))
            return {HIT_STATUS, 0};
        return {HIT_NONE, -1};
@@ -302,19 +287,17 @@ std::pair<int, size_t> Slic3r::GUI::ImageGrid::HitTest(wxPoint const &pt)
        index += m_col_count;
        off.y -= m_cell_size.GetHeight();
    }
-    if (index >= m_model->GetCount()) { return {HIT_NONE, -1}; }
+    if (index >= m_file_sys->GetCount()) { return {HIT_NONE, -1}; }
    if (!m_content_rect.Contains(off)) { return {HIT_NONE, -1}; }
    if (!m_selecting) {
        wxRect hover_rect{0, m_content_rect.GetHeight() - m_buttons_background.GetHeight(), m_content_rect.GetWidth(), m_buttons_background.GetHeight()};
-        const FileGridCard &card = m_model->GetFile(index);
-        int    btn  = card.downloading && card.download_progress >= 0 ? 3 : 2;
-        if (m_model->GetFileType() == FileGridType::Model) {
-            if (m_show_download && card.printable)
+        auto & file = m_file_sys->GetFile(index);
+        int    btn  = file.IsDownload() && file.DownloadProgress() >= 0 ? 3 : 2;
+        if (m_file_sys->GetFileType() == PrinterFileSystem::F_MODEL) {
+            if (m_show_download)
                btn = 3;
            hover_rect.y -= m_content_rect.GetHeight() * 64 / 264;
        }
-        if (!hasSecondAction(card))
-            btn = 1;
        if (hover_rect.Contains(off.x, off.y)) {
            return {HIT_ACTION, index * 4 + off.x * btn / hover_rect.GetWidth()};
        } // Two buttons
@@ -332,12 +315,12 @@ void ImageGrid::mouseMoved(wxMouseEvent& event)
        m_hit_item = hit.second;
        if (hit.first == HIT_ITEM) {
            SetToolTip({});
-            const FileGridCard &card = m_model->GetFile(hit.second);
-            if (auto title = card.title; !title.empty()) {
-                auto tip = wxString::Format(_L("File: %s\nTitle: %s\n"), from_u8(card.name), from_u8(title));
+            auto & file = m_file_sys->GetFile(hit.second);
+            if (auto title = file.Title(); !title.empty()) {
+                auto tip = wxString::Format(_L("File: %s\nTitle: %s\n"), from_u8(file.name), from_u8(title));
                SetToolTip(tip);
            } else {
-                SetToolTip(from_u8(card.name));
+                SetToolTip(from_u8(file.name));
            }
        } else
            SetToolTip({});
@@ -389,9 +372,9 @@ void ImageGrid::mouseReleased(wxMouseEvent& event)
        else if (m_hit_type == HIT_ACTION)
            DoAction(m_hit_item / 4, m_hit_item & 3);
        else if (m_hit_type == HIT_MODE)
-            SetGroupMode(static_cast<int>(2 - m_hit_item));
+            SetGroupMode(static_cast<PrinterFileSystem::GroupMode>(2 - m_hit_item));
        else if (m_hit_type == HIT_STATUS)
-            m_model->Retry();
+            m_file_sys->Retry();
        else
            Refresh();
    } else {
@@ -420,11 +403,20 @@ void ImageGrid::mouseWheelMoved(wxMouseEvent &event)
    Refresh();
 }

-void Slic3r::GUI::ImageGrid::onModelChange(FileGridChange change)
+void Slic3r::GUI::ImageGrid::changedEvent(wxCommandEvent& evt)
 {
-    BOOST_LOG_TRIVIAL(debug) << "ImageGrid::onModelChange: " << (int) change;
-    if (change == FileGridChange::Files || change == FileGridChange::Mode)
+    evt.Skip();
+    BOOST_LOG_TRIVIAL(debug) << "ImageGrid::changedEvent: " << evt.GetEventType() << " index: " << evt.GetInt() 
+            << " name: " << evt.GetString().ToUTF8().data() << " extra: " << evt.GetExtraLong();
+    if (evt.GetEventType() == EVT_FILE_CHANGED) {
+        if (evt.GetInt() == -1)
+            m_file_sys->DownloadCheckFiles(wxGetApp().app_config->get("download_path"));
        UpdateFileSystem();
+    }
+    else if (evt.GetEventType() == EVT_MODE_CHANGED)
+        UpdateFileSystem();
+    //else if (evt.GetEventType() == EVT_THUMBNAIL)
+    //    RefreshRect(itemRect(evt.GetInt()), false);
    else
        Refresh();
 }
@@ -439,7 +431,7 @@ void ImageGrid::paintEvent(wxPaintEvent& evt)
 size_t Slic3r::GUI::ImageGrid::firstItem(wxSize const &size, wxPoint &off)
 {
    int size_y = size.y;
-    if (m_model->GetGroupMode() == FileGridGroup::All)
+    if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE)
        size_y -= m_title_mask.GetHeight();
    int offx  = (size.x - (m_col_count - 1) * m_cell_size.GetWidth() - m_border_size.GetWidth()) / 2;
    int offy  = (m_row_offset + 1 < m_row_count || m_row_count == 0) ?
@@ -447,8 +439,8 @@ size_t Slic3r::GUI::ImageGrid::firstItem(wxSize const &size, wxPoint &off)
                    size_y - (size_y + m_border_size.GetHeight() - 1) / m_cell_size.GetHeight() * m_cell_size.GetHeight();
    int index = (m_row_offset + 1 < m_row_count || m_row_count == 0) ?
                    m_row_offset / 4 * m_col_count :
-                    ((m_model->GetCount() + m_col_count - 1) / m_col_count - (size_y + m_border_size.GetHeight() - 1) / m_cell_size.GetHeight()) * m_col_count;
-    if (m_model->GetGroupMode() == FileGridGroup::All)
+                    ((m_file_sys->GetCount() + m_col_count - 1) / m_col_count - (size_y + m_border_size.GetHeight() - 1) / m_cell_size.GetHeight()) * m_col_count;
+    if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE)
        offy += m_title_mask.GetHeight();
    off = wxPoint{offx, offy};
    return index;
@@ -542,7 +534,7 @@ void ImageGrid::render(wxDC& dc)
    wxSize size = GetClientSize();
    dc.SetPen(wxPen(GetBackgroundColour()));
    dc.SetBrush(wxBrush(GetBackgroundColour()));
-    if (!m_model || m_model->GetCount() == 0) {
+    if (!m_file_sys || m_file_sys->GetCount() == 0) {
        dc.DrawRectangle({ 0, 0, size.x, size.y });
        if (!m_status_msg.IsEmpty()) {
            auto   si = m_status_icon.GetBmpSize();
@@ -570,7 +562,7 @@ void ImageGrid::render(wxDC& dc)
    {
        // Draw one line
        wxPoint pt{off.x, off.y};
-        end = (index + m_col_count) < m_model->GetCount() ? index + m_col_count : m_model->GetCount();
+        end = (index + m_col_count) < m_file_sys->GetCount() ? index + m_col_count : m_file_sys->GetCount();
        while (index < end) {
            pt += m_content_rect.GetTopLeft();
            // Draw content
@@ -579,7 +571,7 @@ void ImageGrid::render(wxDC& dc)
                &ImageGrid::renderContent1,
                &ImageGrid::renderContent2
            };
-            (this->*contentRender[static_cast<int>(m_model->GetFileType())])(dc, pt, index, hit_image == index);
+            (this->*contentRender[m_file_sys->GetFileType()])(dc, pt, index, hit_image == index);
            pt -= m_content_rect.GetTopLeft();
            // Draw colume spacing at right
            dc.DrawRectangle({pt.x + m_border_size.GetWidth(), pt.y, m_cell_size.GetWidth() - m_border_size.GetWidth(), m_border_size.GetHeight()});
@@ -596,13 +588,13 @@ void ImageGrid::render(wxDC& dc)
        off.y += m_cell_size.GetHeight();
    }
    // Draw floating date range for non-group list
-    if (m_model->GetGroupMode() == FileGridGroup::All && m_model->GetCount() > 0) {
+    if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE && m_file_sys->GetCount() > 0) {
        //dc.DrawBitmap(m_title_mask, {off.x, 0});
        dc.DrawRectangle({off.x, 0}, m_title_mask.GetSize());
-        const FileGridCard & file1 = m_model->GetFile(start);
-        const FileGridCard & file2 = m_model->GetFile(end - 1);
-        auto date1 = wxDateTime((time_t) file1.time).Format(_L(TIME_FORMATS[static_cast<int>(m_model->GetGroupMode())]));
-        auto date2 = wxDateTime((time_t) file2.time).Format(_L(TIME_FORMATS[static_cast<int>(m_model->GetGroupMode())]));
+        auto & file1 = m_file_sys->GetFile(start);
+        auto & file2 = m_file_sys->GetFile(end - 1);
+        auto date1 = wxDateTime((time_t) file1.time).Format(_L(TIME_FORMATS[m_file_sys->GetGroupMode()]));
+        auto date2 = wxDateTime((time_t) file2.time).Format(_L(TIME_FORMATS[m_file_sys->GetGroupMode()]));
        dc.SetFont(Label::Head_16);
        dc.SetTextForeground(StateColor::darkModeColorFor("#262E30"));
        dc.DrawText(date1 + " - " + date2, wxPoint{off.x, 2});
@@ -612,7 +604,7 @@ void ImageGrid::render(wxDC& dc)
        dc.DrawRectangle({off.x, off.y, size.x - off.x * 2, size.y - off.y});
    // Draw position bar
    if (m_timer.IsRunning()) {
-        int total_height = (m_model->GetCount() + m_col_count - 1) / m_col_count * m_cell_size.GetHeight() + m_cell_size.GetHeight() - m_border_size.GetHeight();
+        int total_height = (m_file_sys->GetCount() + m_col_count - 1) / m_col_count * m_cell_size.GetHeight() + m_cell_size.GetHeight() - m_border_size.GetHeight();
        if (total_height > size.y) {
            int offset = (m_row_offset + 1 < m_row_count || m_row_count == 0) ? m_row_offset * (m_cell_size.GetHeight() / 4) : total_height - size.y;
            wxRect rect = {size.x - 16, offset * size.y / total_height, 8,
@@ -626,35 +618,15 @@ void ImageGrid::render(wxDC& dc)
 void Slic3r::GUI::ImageGrid::renderContent1(wxDC &dc, wxPoint const &pt, int index, bool hit)
 {
    bool selected = false;
-    const FileGridCard &card = m_model->GetFile(index, selected);
+    auto &file = m_file_sys->GetFile(index, selected);
    // Draw thumbnail
-    if (card.thumbnail.IsOk()) {
-        if (m_model->preserve_thumbnail_aspect()) {
-            // Contain: fit the whole thumbnail and letterbox against the tile background.
-            float scale = std::min((float) m_content_rect.GetWidth() / card.thumbnail.GetWidth(),
-                                   (float) m_content_rect.GetHeight() / card.thumbnail.GetHeight());
-            int   thumb_w = (int) (card.thumbnail.GetWidth() * scale);
-            int   thumb_h = (int) (card.thumbnail.GetHeight() * scale);
-            int   offx    = (m_content_rect.GetWidth() - thumb_w) / 2;
-            int   offy    = (m_content_rect.GetHeight() - thumb_h) / 2;
-            auto  brush   = dc.GetBrush();
-            auto  pen     = dc.GetPen();
-            dc.SetBrush(StateColor::darkModeColorFor(0xEEEEEE));
-            dc.SetPen(StateColor::darkModeColorFor(0xEEEEEE));
-            dc.DrawRectangle(pt, m_content_rect.GetSize());
-            dc.SetUserScale(scale, scale);
-            dc.DrawBitmap(card.thumbnail, {(int) ((pt.x + offx) / scale), (int) ((pt.y + offy) / scale)});
-            dc.SetUserScale(1, 1);
-            dc.SetBrush(brush);
-            dc.SetPen(pen);
-        } else {
-            float hs = (float) m_content_rect.GetWidth() / card.thumbnail.GetWidth();
-            float vs = (float) m_content_rect.GetHeight() / card.thumbnail.GetHeight();
-            dc.SetUserScale(hs, vs);
-            dc.DrawBitmap(card.thumbnail, {(int) (pt.x / hs), (int) (pt.y / vs)});
-            dc.SetUserScale(1, 1);
-        }
-        if (m_model->GetGroupMode() != FileGridGroup::All) { dc.DrawBitmap(m_title_mask, pt); }
+    if (file.thumbnail.IsOk()) {
+        float hs = (float) m_content_rect.GetWidth() / file.thumbnail.GetWidth();
+        float vs = (float) m_content_rect.GetHeight() / file.thumbnail.GetHeight();
+        dc.SetUserScale(hs, vs);
+        dc.DrawBitmap(file.thumbnail, {(int) (pt.x / hs), (int) (pt.y / vs)});
+        dc.SetUserScale(1, 1);
+        if (m_file_sys->GetGroupMode() != PrinterFileSystem::G_NONE) { dc.DrawBitmap(m_title_mask, pt); }
    }
    bool show_download_state_always = true;
    // Draw checked icon
@@ -662,14 +634,14 @@ void Slic3r::GUI::ImageGrid::renderContent1(wxDC &dc, wxPoint const &pt, int ind
        dc.DrawBitmap(selected ? m_checked_icon.bmp() : m_unchecked_icon.bmp(), pt + wxPoint{10, 10});
    // can't handle alpha
    // dc.GradientFillLinear({pt.x, pt.y, m_border_size.GetWidth(), 60}, wxColour(0x6F, 0x6F, 0x6F, 0x99), wxColour(0x6F, 0x6F, 0x6F, 0), wxBOTTOM);
-    else if (m_model->GetGroupMode() == FileGridGroup::All) {
+    else if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE) {
        wxString nonHoverText;
        wxString secondAction = m_show_download ? _L("Download") : "";
        wxString thirdAction;
        int      states = 0;
        // Draw download progress
-        if (card.downloading) {
-            int progress = card.download_progress;
+        if (file.IsDownload()) {
+            int progress = file.DownloadProgress();
            if (progress == -1) {
                secondAction = _L("Cancel");
                nonHoverText = _L("Download waiting...");
@@ -687,7 +659,7 @@ void Slic3r::GUI::ImageGrid::renderContent1(wxDC &dc, wxPoint const &pt, int ind
                thirdAction  = wxString::Format(L"%d%%...", progress);
            }
        }
-        if (m_model->GetFileType() == FileGridType::Model && card.printable) {
+        if (m_file_sys->GetFileType() == PrinterFileSystem::F_MODEL) {
            if (secondAction != _L("Play"))
                thirdAction = secondAction;
            secondAction = _L_CONTEXT("Print", "Verb");
@@ -697,8 +669,7 @@ void Slic3r::GUI::ImageGrid::renderContent1(wxDC &dc, wxPoint const &pt, int ind
        wxArrayString texts;
        if (hit) {
            texts.Add(_L("Delete"));
-            if (hasSecondAction(card))
-                texts.Add(secondAction);
+            texts.Add(secondAction);
            if (!thirdAction.IsEmpty())
                texts.Add(thirdAction);
            renderButtons(dc, texts, rect, m_hit_type == HIT_ACTION ? m_hit_item & 3 : -1, states);
@@ -708,7 +679,7 @@ void Slic3r::GUI::ImageGrid::renderContent1(wxDC &dc, wxPoint const &pt, int ind
        }
    } else {
        dc.SetTextForeground(*wxWHITE); // time text color
-        auto date = wxDateTime((time_t) card.time).Format(_L(TIME_FORMATS[static_cast<int>(m_model->GetGroupMode())]));
+        auto date = wxDateTime((time_t) file.time).Format(_L(TIME_FORMATS[m_file_sys->GetGroupMode()]));
        dc.DrawText(date, pt + wxPoint{24, 16});
    }
    if (m_selecting && show_download_state_always)
@@ -717,7 +688,7 @@ void Slic3r::GUI::ImageGrid::renderContent1(wxDC &dc, wxPoint const &pt, int ind

 void Slic3r::GUI::ImageGrid::renderContent2(wxDC &dc, wxPoint const &pt, int index, bool hit)
 {
-    const FileGridCard &card = m_model->GetFile(index);
+    auto &file = m_file_sys->GetFile(index);
    // Draw thumbnail & buttons
    int h = m_content_rect.GetHeight() * 64 / 264;
    m_content_rect.SetHeight(m_content_rect.GetHeight() - h);
@@ -740,14 +711,14 @@ void Slic3r::GUI::ImageGrid::renderContent2(wxDC &dc, wxPoint const &pt, int ind
    auto em = em_unit(this);
    wxRect rect{pt.x, pt.y + m_content_rect.GetHeight() - h, m_content_rect.GetWidth(), h / 2};
    rect.Deflate(em, 0);
-    renderText2(dc, from_u8(card.name), rect);
+    renderText2(dc, from_u8(file.name), rect);
    rect.Offset(0, h / 2);
    rect.SetWidth(rect.GetWidth() / 2 - em);
    dc.SetFont(Label::Body_13);
    dc.SetTextForeground(StateColor::darkModeColorFor("#6B6B6B"));
-    renderIconText(dc, m_model_time_icon, card.time_text.empty() ? wxString("0m") : from_u8(card.time_text), rect);
+    renderIconText(dc, m_model_time_icon, file.Metadata("Time", "0m"), rect);
    rect.Offset(m_content_rect.GetWidth() / 2, 0);
-    renderIconText(dc, m_model_weight_icon, card.weight_text.empty() ? wxString("0g") : from_u8(card.weight_text), rect);
+    renderIconText(dc, m_model_weight_icon, file.Metadata("Weight", "0g"), rect);
 }

 void Slic3r::GUI::ImageGrid::renderButtons(wxDC &dc, wxArrayString const &texts, wxRect const &rect2, size_t hit, int states)
@@ -23,7 +23,6 @@

 #include "Widgets/StateColor.hpp"
 #include "wxExtensions.hpp"
-#include "Printer/IFileGridModel.h"

 class Button;
 class Label;
@@ -45,8 +44,6 @@ public:

    void SetFileSystem(boost::shared_ptr<PrinterFileSystem> file_sys);

-    void SetModel(boost::shared_ptr<IFileGridModel> model);
-
    void SetStatus(ScalableBitmap const & icon, wxString const &msg);

    boost::shared_ptr<PrinterFileSystem> GetFileSystem() { return m_file_sys; }
@@ -79,12 +76,9 @@ protected:

    std::pair<int, size_t> HitTest(wxPoint const &pt);

-    // True when the hover bar shows a second action next to Delete.
-    bool hasSecondAction(const FileGridCard &card) const;
-
 protected:

-    void onModelChange(FileGridChange change);
+    void changedEvent(wxCommandEvent& evt);

    void paintEvent(wxPaintEvent& evt);

@@ -123,7 +117,6 @@ protected:

 private:
    boost::shared_ptr<PrinterFileSystem> m_file_sys;
-    boost::shared_ptr<IFileGridModel>     m_model;
    ScalableBitmap m_status_icon;
    wxString m_status_msg;

@@ -8,6 +8,7 @@
 #include "libslic3r/TextureDisplacement.hpp"
 #include <exception>
 #include <cstddef>
+#include <cstdint>
 #include "slic3r/GUI/Jobs/Worker.hpp"
 #include <memory>

@@ -26,6 +27,7 @@
 #include "slic3r/Utils/UndoRedo.hpp"
 #include "libslic3r/ObjectID.hpp"
 #include "libslic3r/TriangleMesh.hpp"
+#include <array>

 namespace Slic3r::GUI {

@@ -74,7 +76,8 @@ void TextureDisplacementBakeJob::process(Ctl &ctl)
            }
            return true;
        },
-        color, m_input.volume_to_world, nullptr, &m_stats));
+        color, m_input.volume_to_world, nullptr, &m_stats,
+        m_input.model_uv.empty() ? nullptr : &m_input.model_uv));

    // Always finish at 100: this is what closes the notification. Reported even on cancel, where
    // build_texture_displacement() returns an empty mesh and finalize() commits nothing.
@@ -126,16 +129,71 @@ void TextureDisplacementBakeJob::finalize(bool canceled, std::exception_ptr &ept
                                                     { mix.a_percent(), 100 - mix.a_percent() });
            });

+        // Whether the bake replaced the triangles or only moved the vertices it was given. The classic
+        // path is topology-preserving by contract, so every per-triangle annotation on the volume still
+        // means what it did; the default pipeline refines, cuts and simplifies, so none of them do.
+        // Both are checked: the flag is what the bake promised, the count is what it delivered. Only
+        // the triangles matter - the annotations are per facet and reference no vertex index - so a
+        // vertex count that changed on its own (the bake compacts unreferenced vertices away) is not a
+        // reason to remap anything.
+        const bool topology_changed = m_input.options.pipeline_v2 ||
+                                      m_result.its.indices.size() != m_input.base_mesh.indices.size();
+
+        // Carry the volume's existing paint - the model's own colours above all - across that rebuild.
+        // Without it a bake left the mmu_segmentation_facets bitstream pointing at a triangle set that
+        // no longer existed, which is what scrambled the colours of an imported coloured model even
+        // with colour switched off on every layer and nothing in the bake that was meant to touch them.
+        //
+        // transfer_facet_paint() rather than ModelVolume::restore_painting(): the latter's remap wants
+        // a target triangle overlapping the source paint to within 0.01 mm, which the baked surface is
+        // nowhere near - it has moved by the relief depth. Nothing to do when the topology is intact:
+        // triangle i is still triangle i, so the paint is already exactly right and carrying it at all
+        // could only lose detail.
+        std::array<TriangleSelector::TriangleSplittingData, 4> before;
+        if (topology_changed) {
+            before[0] = volume->supported_facets.get_data();
+            before[1] = volume->seam_facets.get_data();
+            before[2] = volume->mmu_segmentation_facets.get_data();
+            before[3] = volume->fuzzy_skin_facets.get_data();
+        }
+
        volume->set_mesh(std::move(m_result));
        volume->set_new_unique_id();
        volume->calculate_convex_hull();

+        if (topology_changed) {
+            const std::array<FacetsAnnotation *, 4> target{ &volume->supported_facets, &volume->seam_facets,
+                                                            &volume->mmu_segmentation_facets,
+                                                            &volume->fuzzy_skin_facets };
+            for (size_t ch = 0; ch < target.size(); ++ch) {
+                const std::vector<uint8_t> state =
+                    transfer_facet_paint(m_input.base_mesh, before[ch], volume->mesh().its);
+                // Nothing was painted in this channel, or there is nothing to paint it onto: either
+                // way the annotation must not keep describing the mesh that is gone.
+                if (state.empty()) {
+                    target[ch]->reset();
+                    continue;
+                }
+                TriangleSelector selector(volume->mesh());
+                bool             any = false;
+                for (size_t i = 0; i < state.size(); ++i)
+                    if (state[i] != 0) {
+                        selector.set_facet(int(i), EnforcerBlockerType(state[i]));
+                        any = true;
+                    }
+                if (any)
+                    target[ch]->set(selector);
+                else
+                    target[ch]->reset();
+            }
+        }
+
        // Colour lands in mmu_segmentation_facets, merged *over* whatever is already painted there
        // rather than replacing it: a triangle the texture does not colour keeps its existing filament,
        // and one the user never painted at all stays at NONE, which already means "the volume's own
        // filament". That is what confines the effect to the painted area without having to invent a
-        // colour for everything outside it. Safe to index straight onto the new mesh - the bake is
-        // topology-preserving, so triangle i is still triangle i.
+        // colour for everything outside it. What was already painted is whatever the transfer above
+        // left in the annotation, so this bake's colour lands on top of it rather than instead of it.
        if (!m_triangle_color.empty() && m_triangle_color.size() == volume->mesh().its.indices.size()) {
            TriangleSelector selector(volume->mesh());
            const TriangleSelector::TriangleSplittingData &existing = volume->mmu_segmentation_facets.get_data();
@@ -159,7 +217,6 @@ void TextureDisplacementBakeJob::finalize(bool canceled, std::exception_ptr &ept
        // pipeline, which rebuilds and then simplifies the mesh. A mask left behind against the old
        // topology is exactly what makes the gizmo reload an empty selector over a non-empty mask and
        // then erase it on the next flush - see GLGizmoTextureDisplacement::update_from_model_object().
-        const bool topology_changed = m_input.base_mesh.indices.size() != volume->mesh().its.indices.size();
        for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot) {
            const auto it = std::find_if(m_input.layers.begin(), m_input.layers.end(),
                                         [slot](const TextureDisplacementLayer &l) { return l.slot == slot; });
@@ -167,6 +224,14 @@ void TextureDisplacementBakeJob::finalize(bool canceled, std::exception_ptr &ept
                volume->texture_displacement_facet(slot).reset();
        }

+        // The model's own UV channel. Resampled onto a rebuilt mesh from the surface the bake started
+        // from: a displaced vertex came from its foot point on that surface, which is the position its
+        // uv belongs to - so no distance limit, the relief depth is exactly how far it has moved.
+        if (!m_input.model_uv.empty())
+            volume->texture_uv = topology_changed ? transfer_uv_channel(m_input.base_mesh, m_input.model_uv,
+                                                                        volume->mesh().its) :
+                                                     m_input.model_uv;
+
        ModelObject *object = volume->get_object();
        if (object == nullptr)
            return;
@@ -219,6 +284,8 @@ void queue_texture_displacement_bake(const ModelVolume &volume, const TextureCol
    input.take_snapshot = take_snapshot;
    input.volume_id  = volume.id();
    input.base_mesh  = volume.mesh().its;
+    if (volume.has_texture_uv())
+        input.model_uv = volume.texture_uv;
    input.layers     = volume.texture_displacement_layers;
    input.options    = volume.texture_displacement_options;
    input.volume_to_world = texture_displacement_volume_to_world(volume);
@@ -34,6 +34,9 @@ struct TextureDisplacementBakeInput
    // writes the volume's mmu_segmentation_facets - the same per-triangle filament assignment the MMU
    // paint gizmo writes - alongside the displaced geometry.
    TextureColorSettings                  color;
+    // The volume's own UV channel (ModelVolume::texture_uv), empty when it has none: what a ModelUV
+    // layer maps through, and what the commit puts back on the baked mesh.
+    std::vector<Vec2f>                    model_uv;
    // Whether this job pushes its own undo step when it commits. False when the caller has already
    // taken one that is meant to cover the displacement as well - Standard mode's Bake, which remeshes
    // and subdivides first and has to undo as a single action.
@@ -17,6 +17,7 @@
 #include "slic3r/GUI/Jobs/Worker.hpp"
 #include <memory>
 #include "libslic3r/ObjectID.hpp"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"

 namespace Slic3r::GUI {
@@ -52,13 +53,14 @@ void TextureDisplacementDebugJob::process(Ctl &ctl)

    indexed_triangle_set          mesh  = m_input.base_mesh;
    TextureDisplacementFacetsData masks = m_input.facets_data;
+    std::vector<Vec2f>            uv    = m_input.model_uv;

    // The default pipeline can only move vertices the mesh already has, so its recipe starts with the
    // preparation - which is where "first it remeshes, then it refines" actually happens. The
    // experimental pipeline refines as part of the bake and has nothing to prepare.
    if (m_input.run_prepare && !m_input.options.pipeline_v2) {
        const TextureDisplacementPrepareResult prepared =
-            GLGizmoTextureDisplacement::prepare_mesh(mesh, masks, m_input.layers, m_input.prepare_params,
+            GLGizmoTextureDisplacement::prepare_mesh(mesh, masks, m_input.layers, uv, m_input.prepare_params,
                                                     m_input.color,
                                                     // Preparation is roughly half the run; the bake
                                                     // takes the progress bar from there.
@@ -77,12 +79,14 @@ void TextureDisplacementDebugJob::process(Ctl &ctl)
        if (!prepared.mesh.indices.empty()) {
            mesh  = prepared.mesh;
            masks = prepared.masks;
+            uv    = prepared.uv; // resampled onto the prepared mesh, as the prepare commit stores it
        }
    }

    build_texture_displacement(mesh, m_input.layers, masks, m_input.options,
                               [&report](int pct) { return report(50 + pct / 2); },
-                               /* color */ nullptr, m_input.volume_to_world, &recorder);
+                               /* color */ nullptr, m_input.volume_to_world, &recorder, /* stats */ nullptr,
+                               uv.empty() ? nullptr : &uv);

    m_stages = recorder.take();
    ctl.update_status(100, status); // always finish at 100: this is what closes the notification
@@ -115,6 +119,8 @@ void queue_texture_displacement_debug(const ModelVolume &volume, const TextureCo
    input.check_topology  = check_topology;
    input.color           = color;
    input.volume_to_world = texture_displacement_volume_to_world(volume);
+    if (volume.has_texture_uv())
+        input.model_uv = volume.texture_uv;
    for (int i = 0; i < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++i)
        input.facets_data[size_t(i)] = volume.texture_displacement_facet(i).get_data();

@@ -47,6 +47,9 @@ struct TextureDisplacementDebugInput
    // Only the quantizer is used, and only by the refinement's colour criterion - the debug run
    // produces no colour of its own.
    TextureColorSettings                  color;
+    // The volume's own UV channel (ModelVolume::texture_uv), so the recipe captured here is the one a
+    // ModelUV layer actually bakes through. Empty when the volume has none.
+    std::vector<Vec2f>                    model_uv;

    // The edge scan behind the open / non-manifold counts is a sort over every half-edge, which on a
    // multi-million triangle stage costs more than the stage did. On by default because a stage that
@@ -46,7 +46,7 @@ void TextureDisplacementPrepareJob::process(Ctl &ctl)
    // idle loop.
    int last_reported = 1;
    m_result = GLGizmoTextureDisplacement::prepare_mesh(m_input.base_mesh, m_input.masks, m_input.layers,
-                                                        m_input.params, m_input.color,
+                                                        m_input.model_uv, m_input.params, m_input.color,
                                                        [&ctl, &status, &last_reported](int percent) {
                                                            if (ctl.was_canceled())
                                                                return false;
@@ -106,6 +106,10 @@ void TextureDisplacementPrepareJob::finalize(bool canceled, std::exception_ptr &
        volume->restore_painting(saved_painting);
        for (int i = 0; i < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++i)
            volume->texture_displacement_facet(i).set_data(std::move(m_result.masks[size_t(i)]));
+        // The model's own UV channel, resampled onto the new mesh by the run. Also put back after
+        // restore_painting(), which resets it along with the extra facets for the same reason: it is
+        // indexed by triangle and the triangles have changed.
+        volume->texture_uv = std::move(m_result.uv);

        if (ObjectList *obj_list = wxGetApp().obj_list()) {
            const ModelObjectPtrs &objs = plater->model().objects;
@@ -9,6 +9,7 @@
 #include "Job.hpp"

 #include "libslic3r/ObjectID.hpp"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/TextureDisplacement.hpp"

 namespace Slic3r {
@@ -47,6 +48,10 @@ struct TextureDisplacementPrepareInput
    // skips the colour criterion entirely. Only the *quantizer* is used here: refinement follows
    // perceived colour, never the interleaving that realises a mix.
    TextureColorSettings                  color;
+    // The volume's own UV channel (ModelVolume::texture_uv), empty when it has none. prepare_mesh()
+    // resamples it onto the mesh it produces, and the commit puts it back - like the masks, it is
+    // indexed by triangle and so cannot survive the stages on its own.
+    std::vector<Vec2f>                    model_uv;
    // The undo step the commit opens. Standard mode's Bake names it after the bake, because the
    // displacement job that follows commits into this same step rather than pushing its own.
    std::string                           snapshot_name;
@@ -48,7 +48,8 @@ void TextureDisplacementPreviewJob::process(Ctl &ctl)
                                                     (!m_current_generation ||
                                                      m_current_generation->load() == m_generation);
                                          },
-                                          color, m_input.volume_to_world);
+                                          color, m_input.volume_to_world, nullptr, nullptr,
+                                          m_input.model_uv.empty() ? nullptr : &m_input.model_uv);
 }

 void TextureDisplacementPreviewJob::finalize(bool canceled, std::exception_ptr &eptr)
@@ -29,6 +29,9 @@ struct TextureDisplacementPreviewInput
    // Empty unless a layer is colouring, in which case the preview reports the palette entry per
    // triangle alongside the mesh, so the Normal view shows the colours the bake will produce.
    TextureColorSettings                  color;
+    // The volume's own UV channel (ModelVolume::texture_uv), so a ModelUV layer previews through the
+    // same layout it will bake through. Empty when the volume has none.
+    std::vector<Vec2f>                    model_uv;
 };

 // A preview result: the displaced mesh, and - when the input carried a palette - one palette entry per
@@ -221,40 +221,26 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
        SetSelecting(false);
    });

-    Bind(wxEVT_SHOW, &MediaFilePanel::on_show_hide, this);
-    // A Device sub-tab switch hides the page container (StoragePanel); a main tab
-    // switch hides MonitorPanel inside LazyPage. Neither event reaches the other,
-    // so watch every ancestor below the top-level frame.
-    for (wxWindow* w = GetParent(); w && !w->IsTopLevel(); w = w->GetParent()) {
-        w->Bind(wxEVT_SHOW, &MediaFilePanel::on_show_hide, this);
-        m_show_hosts.push_back(w);
-    }
+    auto onShowHide = [this](auto &e) {
+        e.Skip();
+        if (auto w = dynamic_cast<wxWindow *>(e.GetEventObject()); !w || w->IsBeingDeleted())
+            return;
+        CallAfter([this] {
+            auto fs = m_image_grid ? m_image_grid->GetFileSystem() : nullptr;
+            if (fs) IsShownOnScreen() ? fs->Start() : fs->Stop();
+        });
+    };
+    Bind(wxEVT_SHOW, onShowHide);
+    parent->GetParent()->Bind(wxEVT_SHOW, onShowHide);

    m_lan_user = "bblp";
 }

 MediaFilePanel::~MediaFilePanel()
 {
-    Unbind(wxEVT_SHOW, &MediaFilePanel::on_show_hide, this);
-    for (wxWindow* w : m_show_hosts)
-        if (w && !w->IsBeingDeleted())
-            w->Unbind(wxEVT_SHOW, &MediaFilePanel::on_show_hide, this);
-    m_show_hosts.clear();
-
    UpdateByObj(nullptr);
 }

-void MediaFilePanel::on_show_hide(wxShowEvent& e)
-{
-    e.Skip();
-    if (auto w = dynamic_cast<wxWindow*>(e.GetEventObject()); !w || w->IsBeingDeleted())
-        return;
-    CallAfter([this] {
-        auto fs = m_image_grid ? m_image_grid->GetFileSystem() : nullptr;
-        if (fs) IsShownOnScreen() ? fs->Start() : fs->Stop();
-    });
-}
-
 void MediaFilePanel::UpdateByObj(MachineObject* obj)
 {
    bool sdcard_state_changed = false;
@@ -11,7 +11,6 @@
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <cstddef>
 #include <set>
-#include <vector>

 #include "GUI_Utils.hpp"
 #include "wxExtensions.hpp"
@@ -54,8 +53,6 @@ public:
 private:
    void modeChanged(wxCommandEvent & e);

-    void on_show_hide(wxShowEvent & e);
-
    void fetchUrl(boost::weak_ptr<PrinterFileSystem> fs);

    void doAction(size_t index, int action);
@@ -102,8 +99,6 @@ private:
    int m_last_mode = 0;
    int m_last_type = 0;
    std::set<int> m_last_errors;
-
-    std::vector<wxWindow*> m_show_hosts;
 };


@@ -44,7 +44,7 @@
 #include "Plater.hpp"
 #include "MainFrame.hpp"
 #include "MediaPlayCtrl.h"
-#include "StoragePanel.h"
+#include "MediaFilePanel.h"
 #include "BindDialog.hpp"

 #include "DeviceCore/DevManager.h"
@@ -201,9 +201,9 @@ void MonitorPanel::init_tabpanel()
    m_tabpanel->SetBackgroundColour(wxColour("#FEFFFF"));
    m_tabpanel->Bind(wxEVT_BOOKCTRL_PAGE_CHANGED, [this](wxBookCtrlEvent& e) {
        auto page = m_tabpanel->GetCurrentPage();
-        if (page == m_storage_panel) {
+        if (page == m_media_file_panel) {
            auto title = m_tabpanel->GetPageText(m_tabpanel->GetSelection());
-            m_storage_panel->SwitchStorage(title == _L("Storage"));
+            m_media_file_panel->SwitchStorage(title == _L("Storage"));
        }
        // The first page is selected while the panel is built off screen.
        if (page->IsShownOnScreen())
@@ -217,8 +217,8 @@ void MonitorPanel::init_tabpanel()
    add_build_steps_of(*m_status_info_panel);
    m_tabpanel->AddPage(m_status_info_panel, _L("Status"), true);
    add_build_step([this] {
-        m_storage_panel = new StoragePanel(m_tabpanel);
-        m_tabpanel->AddPage(m_storage_panel, _L("Storage"), false);
+        m_media_file_panel = new MediaFilePanel(m_tabpanel);
+        m_tabpanel->AddPage(m_media_file_panel, _L("Storage"), false);
    });
    add_build_step([this] {
        m_upgrade_panel = new UpgradePanel(m_tabpanel);
@@ -267,8 +267,7 @@ void MonitorPanel::on_sys_color_changed()
 {
    m_status_info_panel->on_sys_color_changed();
    m_upgrade_panel->on_sys_color_changed();
-    m_storage_panel->on_sys_color_changed();
-    m_storage_panel->Rescale();
+    m_media_file_panel->Rescale();
 }

 void MonitorPanel::msw_rescale()
@@ -280,7 +279,7 @@ void MonitorPanel::msw_rescale()
    m_tabpanel->Rescale();
    //m_status_add_machine_panel->msw_rescale();
    m_status_info_panel->msw_rescale();
-    m_storage_panel->Rescale();
+    m_media_file_panel->Rescale();
    m_upgrade_panel->msw_rescale();
    m_hms_panel->msw_rescale();

@@ -427,8 +426,8 @@ void MonitorPanel::update_all()
        }
    } else if (current_page == m_upgrade_panel) {
        m_upgrade_panel->update(obj);
-    } else if (current_page == m_storage_panel) {
-        m_storage_panel->UpdateByObj(obj);
+    } else if (current_page == m_media_file_panel) {
+        m_media_file_panel->UpdateByObj(obj);
    }

    if (current_page == m_hms_panel || (obj->GetHMS()->GetHMSItems().size() != m_hms_panel->temp_hms_list.size())) {
@@ -57,7 +57,7 @@
 namespace Slic3r {
 namespace GUI {

-class StoragePanel;
+class MediaFilePanel;

 class AddMachinePanel : public wxPanel
 {
@@ -83,7 +83,7 @@ private:
    wxSizer*        m_main_sizer{ nullptr };

    StatusPanel*        m_status_info_panel{ nullptr };
-    StoragePanel*       m_storage_panel{ nullptr };
+    MediaFilePanel*     m_media_file_panel{ nullptr };
    UpgradePanel*       m_upgrade_panel{ nullptr };
    HMSPanel*           m_hms_panel{ nullptr };

@@ -1,6 +0,0 @@
-
-namespace Slic3r {
-namespace GUI {
-
-} // namespace GUI
-} // namespace Slic3r
@@ -1,11 +0,0 @@
-#ifndef slic3r_MultiTaskModel_hpp_
-#define slic3r_MultiTaskModel_hpp_
-
-namespace Slic3r { 
-namespace GUI {
-
-
-} // namespace GUI
-} // namespace Slic3r
-
-#endif
@@ -1,275 +0,0 @@
-#include "OrcaFilesPanel.h"
-
-#include "DeviceManager.hpp"
-#include "GUI_App.hpp"
-#include "GUI.hpp"
-#include "I18N.hpp"
-#include "ImageGrid.h"
-#include "MsgDialog.hpp"
-#include "Widgets/Button.hpp"
-#include "Widgets/Label.hpp"
-#include "Widgets/StaticBox.hpp"
-#include "Widgets/StateColor.hpp"
-#include "slic3r/Utils/NetworkAgent.hpp"
-#include "slic3r/Utils/bambu_networking.hpp"
-
-#include <boost/make_shared.hpp>
-#include <slic3r/GUI/wxExtensions.hpp>
-#include <slic3r/GUI/Printer/IFileGridModel.h>
-#include <cstddef>
-#include <boost/smart_ptr/make_shared_object.hpp>
-#include <wx/colour.h>
-#include <wx/panel.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/sizer.h>
-#include <utility>
-
-namespace Slic3r {
-namespace GUI {
-
-OrcaFilesPanel::OrcaFilesPanel(wxWindow* parent)
-    : wxPanel(parent, wxID_ANY)
-    , m_bmp_loading(this, "media_loading", 0)
-    , m_bmp_failed(this, "media_failed", 0)
-    , m_bmp_empty(this, "media_empty", 0)
-{
-    const wxColour light_background("#EEEEEE");
-    SetBackgroundColour(wxGetApp().dark_mode() ? StateColor::darkModeColorFor(light_background) : light_background);
-
-    auto* sizer = new wxBoxSizer(wxVERTICAL);
-    auto* toolbar = new wxBoxSizer(wxHORIZONTAL);
-    toolbar->SetMinSize({-1, 75 * em_unit(this) / 10});
-
-    m_root_label = new Label(this, _L("gcodes"));
-    m_root_label->SetFont(Label::Head_16);
-    toolbar->Add(m_root_label, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 24);
-
-    m_time_panel = new ::StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
-    m_time_panel->SetCornerRadius(0);
-    m_button_year = new ::Button(m_time_panel, _L("Year"), "", wxBORDER_NONE);
-    m_button_month = new ::Button(m_time_panel, _L("Month"), "", wxBORDER_NONE);
-    m_button_all = new ::Button(m_time_panel, _L("All Files"), "", wxBORDER_NONE);
-    m_button_year->SetToolTip(_L("Group files by year, recent first."));
-    m_button_month->SetToolTip(_L("Group files by month, recent first."));
-    m_button_all->SetToolTip(_L("Show all files, recent first."));
-    for (auto* button : {m_button_year, m_button_month, m_button_all}) {
-        button->SetBackgroundColor(StateColor(
-            std::make_pair(0xEEEEEE, static_cast<int>(StateColor::Checked)),
-            std::make_pair(*wxLIGHT_GREY, static_cast<int>(StateColor::Hovered)),
-            std::make_pair(*wxWHITE, static_cast<int>(StateColor::Normal))));
-        button->SetTextColor(StateColor(
-            std::make_pair(0x3B4446, static_cast<int>(StateColor::Checked)),
-            std::make_pair(*wxLIGHT_GREY, static_cast<int>(StateColor::Hovered)),
-            std::make_pair(0xABACAC, static_cast<int>(StateColor::Normal))));
-        button->SetCanFocus(false);
-    }
-    auto* time_sizer = new wxBoxSizer(wxHORIZONTAL);
-    time_sizer->Add(m_button_year, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 24);
-    time_sizer->Add(m_button_month, 0, wxALIGN_CENTER_VERTICAL);
-    time_sizer->Add(m_button_all, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 24);
-    m_time_panel->SetSizer(time_sizer);
-    toolbar->AddStretchSpacer(1);
-    toolbar->Add(m_time_panel, 0, wxALIGN_CENTER_VERTICAL);
-    toolbar->AddStretchSpacer(1);
-
-    m_button_refresh = new ::Button(this, _L("Refresh"));
-    m_button_refresh->SetToolTip(_L("Reload file list from printer."));
-    m_button_refresh->SetFont(Label::Body_12);
-    m_button_refresh->SetCornerRadius(12);
-    m_button_refresh->SetPaddingSize({10, 6});
-    m_button_refresh->SetCanFocus(false);
-    m_button_refresh->SetBorderWidth(0);
-    toolbar->Add(m_button_refresh, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 24);
-    sizer->Add(toolbar, 0, wxEXPAND);
-
-    m_image_grid = new ImageGrid(this);
-    // Theme this grid instance without changing the shared Bambu defaults.
-    m_image_grid->SetBackgroundColour(GetBackgroundColour());
-    m_image_grid->SetSelecting(false);
-    m_image_grid->ShowDownload(false);
-    m_image_grid->SetStatus(m_bmp_failed, _L("Please confirm if the printer is connected."));
-    sizer->Add(m_image_grid, 1, wxEXPAND);
-    SetSizer(sizer);
-    applyThemeColors();
-    updateGroupButtons(m_group_mode);
-
-    auto group_clicked = [this](wxCommandEvent& event) {
-        const FileGridGroup mode = event.GetEventObject() == m_button_year ? FileGridGroup::Year :
-                                   event.GetEventObject() == m_button_month ? FileGridGroup::Month : FileGridGroup::All;
-        m_image_grid->SetGroupMode(static_cast<int>(mode));
-        updateGroupButtons(mode);
-    };
-    m_button_year->Bind(wxEVT_COMMAND_BUTTON_CLICKED, group_clicked);
-    m_button_month->Bind(wxEVT_COMMAND_BUTTON_CLICKED, group_clicked);
-    m_button_all->Bind(wxEVT_COMMAND_BUTTON_CLICKED, group_clicked);
-
-    m_button_refresh->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& event) {
-        event.Skip();
-        if (m_model)
-            m_model->Refresh();
-    });
-
-    m_image_grid->Bind(EVT_ITEM_ACTION, [this](wxCommandEvent& event) {
-        const int action = event.GetInt();
-        if (!m_model || m_device_id.empty())
-            return;
-
-        const size_t index = static_cast<size_t>(event.GetExtraLong());
-        if (index >= m_model->GetCount())
-            return;
-        const FileGridCard& card = m_model->GetFile(index);
-        if (card.id.empty())
-            return;
-        const std::string path = card.id;
-        const std::string name = card.name;
-
-        if (action == 0) {
-            MessageDialog dlg(this,
-                wxString::Format(_L("Do you want to delete the file '%s' from printer?"), from_u8(name)),
-                _L("Delete file"), wxYES_NO | wxICON_WARNING);
-            if (dlg.ShowModal() != wxID_YES)
-                return;
-
-            m_model->DeleteFile(path, [this](bool ok) {
-                if (ok)
-                    return;
-                MessageDialog(this, _L("Failed to delete the file from printer."), _L("Delete file"),
-                              wxOK | wxICON_ERROR).ShowModal();
-            });
-        } else if (action == 1) {
-            // OrcaSonar unpacks a .gcode.3mf to its plate G-code before starting the print.
-            MessageDialog dlg(this,
-                wxString::Format(_L("Do you want to print the file '%s' from printer?"), from_u8(name)),
-                _L("Print file"), wxYES_NO | wxICON_WARNING);
-            if (dlg.ShowModal() != wxID_YES)
-                return;
-
-            NetworkAgent* agent = wxGetApp().getAgent();
-            if (!agent)
-                return;
-
-            PrintParams params;
-            params.dev_id          = m_device_id;
-            params.dst_file        = path;
-            params.connection_type = "lan";
-            if (agent->start_sdcard_print(params, {}, {}) != BAMBU_NETWORK_SUCCESS)
-                MessageDialog(this, _L("Failed to start the print job."), _L("Print file"),
-                              wxOK | wxICON_ERROR).ShowModal();
-        }
-    });
-}
-
-OrcaFilesPanel::~OrcaFilesPanel()
-{
-    if (m_model)
-        m_model->SetStatusHandler({});
-    if (m_model)
-        m_model->SetGroupModeHandler({});
-    m_image_grid->SetModel(nullptr);
-    m_model.reset();
-}
-
-void OrcaFilesPanel::UpdateByObj(MachineObject* obj)
-{
-    const std::string device_id = obj ? obj->get_dev_id() : std::string();
-    if (device_id == m_device_id)
-        return;
-
-    m_device_id = device_id;
-    if (m_model)
-        m_model->SetStatusHandler({});
-    if (m_model)
-        m_model->SetGroupModeHandler({});
-    m_image_grid->SetModel(nullptr);
-    m_model.reset();
-
-    if (m_device_id.empty()) {
-        m_button_refresh->Enable(false);
-        m_image_grid->SetStatus(m_bmp_failed, _L("Please confirm if the printer is connected."));
-        return;
-    }
-
-    m_model = boost::make_shared<RemoteFileGridModel>(m_device_id);
-    m_model->SetStatusHandler([this](RemoteFileGridModel::Status status) { updateStatus(status); });
-    m_model->SetGroupModeHandler([this](FileGridGroup mode) { updateGroupButtons(mode); });
-    m_model->SetGroupMode(m_group_mode);
-    m_image_grid->SetModel(m_model);
-    m_image_grid->SetFileType(static_cast<int>(FileGridType::Model), {});
-    m_button_refresh->Enable(true);
-    m_model->Refresh();
-}
-
-void OrcaFilesPanel::updateStatus(RemoteFileGridModel::Status status)
-{
-    switch (status) {
-    case RemoteFileGridModel::Status::Loading:
-        m_image_grid->SetStatus(m_bmp_loading, _L("Loading file list..."));
-        break;
-    case RemoteFileGridModel::Status::Ready:
-        break;
-    case RemoteFileGridModel::Status::Empty:
-        m_image_grid->SetStatus(m_bmp_empty, _L("No files"));
-        break;
-    case RemoteFileGridModel::Status::Failed:
-        m_image_grid->SetStatus(m_bmp_failed, _L("Load failed"));
-        break;
-    }
-}
-
-void OrcaFilesPanel::Rescale()
-{
-    m_bmp_loading.msw_rescale();
-    m_bmp_failed.msw_rescale();
-    m_bmp_empty.msw_rescale();
-
-    auto* toolbar = GetSizer()->GetItem(static_cast<size_t>(0))->GetSizer();
-    toolbar->SetMinSize({-1, 75 * em_unit(this) / 10});
-    m_root_label->SetFont(Label::Head_16);
-    m_button_refresh->Rescale();
-    m_button_year->Rescale();
-    m_button_month->Rescale();
-    m_button_all->Rescale();
-    m_image_grid->Rescale();
-}
-
-void OrcaFilesPanel::on_sys_color_changed()
-{
-    applyThemeColors();
-    Layout();
-    Refresh();
-}
-
-void OrcaFilesPanel::applyThemeColors()
-{
-    const bool dark = wxGetApp().dark_mode();
-    const wxColour light_background("#EEEEEE");
-    const wxColour light_text("#262E30");
-    const wxColour light_teal("#009688");
-    const wxColour background = dark ? StateColor::darkModeColorFor(light_background) : light_background;
-
-    SetBackgroundColour(background);
-    m_root_label->SetBackgroundColour(background);
-    m_root_label->SetForegroundColour(dark ? StateColor::darkModeColorFor(light_text) : light_text);
-    m_time_panel->SetBackgroundColour(background);
-    m_button_refresh->SetBackgroundColorNormal(dark ? StateColor::darkModeColorFor(light_teal) : light_teal);
-    m_button_refresh->SetTextColorNormal(*wxWHITE);
-    m_image_grid->SetBackgroundColour(background);
-    m_image_grid->Refresh();
-    m_button_year->Refresh();
-    m_button_month->Refresh();
-    m_button_all->Refresh();
-}
-
-void OrcaFilesPanel::updateGroupButtons(FileGridGroup mode)
-{
-    m_group_mode = mode;
-    ::Button* buttons[] = {m_button_all, m_button_month, m_button_year};
-    const int selected = static_cast<int>(mode);
-    for (int i = 0; i < 3; ++i) {
-        buttons[i]->SetValue(i == selected);
-        buttons[i]->SetFont(i == selected ? Label::Head_14 : Label::Body_14);
-    }
-}
-
-}}
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "GUI_Utils.hpp"
-#include "wxExtensions.hpp"
-#include "Printer/RemoteFileGridModel.h"
-
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <slic3r/GUI/Printer/IFileGridModel.h>
-#include <string>
-#include <wx/panel.h>
-
-class Button;
-class Label;
-class StaticBox;
-
-namespace Slic3r {
-class MachineObject;
-
-namespace GUI {
-
-class ImageGrid;
-
-class OrcaFilesPanel : public wxPanel
-{
-public:
-    explicit OrcaFilesPanel(wxWindow* parent);
-    ~OrcaFilesPanel() override;
-
-    void UpdateByObj(MachineObject* obj);
-    void Rescale();
-    void on_sys_color_changed();
-
-private:
-    void applyThemeColors();
-    void updateGroupButtons(FileGridGroup mode);
-    void updateStatus(RemoteFileGridModel::Status status);
-
-    ScalableBitmap m_bmp_loading;
-    ScalableBitmap m_bmp_failed;
-    ScalableBitmap m_bmp_empty;
-    Label* m_root_label = nullptr;
-    ::StaticBox* m_time_panel = nullptr;
-    ::Button* m_button_year = nullptr;
-    ::Button* m_button_month = nullptr;
-    ::Button* m_button_all = nullptr;
-    ::Button* m_button_refresh = nullptr;
-    ImageGrid* m_image_grid = nullptr;
-    boost::shared_ptr<RemoteFileGridModel> m_model;
-    std::string m_device_id;
-    FileGridGroup m_group_mode = FileGridGroup::All;
-};
-
-}}
@@ -6467,10 +6467,9 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn)
            for (const auto &entry : wxGetApp().preset_bundle->filament_ams_list) {
                const auto &tray = entry.second;
                const bool has_filament = !tray.opt_string("filament_id", 0u).empty();
-                const bool has_type     = !tray.opt_string("filament_type", 0u).empty();
                const bool is_placeholder = tray.has("filament_slot_placeholder") &&
                                             tray.opt_bool("filament_slot_placeholder", 0u);
-                if (!has_filament && !is_placeholder && !has_type) {
+                if (!has_filament && !is_placeholder) {
                    continue;
                }
                if (combo_index >= p->combos_filament.size()) {
@@ -1,204 +0,0 @@
-#include "BambuFileGridModel.h"
-
-#include "slic3r/GUI/GUI_App.hpp"
-
-#include <slic3r/GUI/Printer/IFileGridModel.h>
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <slic3r/GUI/Printer/PrinterFileSystem.h>
-#include <cstddef>
-#include <ctime>
-#include <functional>
-#include <utility>
-#include <wx/event.h>
-
-namespace Slic3r {
-namespace GUI {
-
-static const FileGridCard& emptyCard()
-{
-    static const FileGridCard card;
-    return card;
-}
-
-BambuFileGridModel::BambuFileGridModel(boost::shared_ptr<PrinterFileSystem> fs)
-    : m_fs(std::move(fs))
-{
-    if (m_fs) {
-        m_fs->Bind(EVT_FILE_CHANGED, &BambuFileGridModel::onFileChanged, this);
-        m_fs->Bind(EVT_MODE_CHANGED, &BambuFileGridModel::onModeChanged, this);
-        m_fs->Bind(EVT_THUMBNAIL, &BambuFileGridModel::onThumbnail, this);
-        m_fs->Bind(EVT_DOWNLOAD, &BambuFileGridModel::onDownload, this);
-    }
-}
-
-BambuFileGridModel::~BambuFileGridModel()
-{
-    if (m_fs) {
-        m_fs->Unbind(EVT_FILE_CHANGED, &BambuFileGridModel::onFileChanged, this);
-        m_fs->Unbind(EVT_MODE_CHANGED, &BambuFileGridModel::onModeChanged, this);
-        m_fs->Unbind(EVT_THUMBNAIL, &BambuFileGridModel::onThumbnail, this);
-        m_fs->Unbind(EVT_DOWNLOAD, &BambuFileGridModel::onDownload, this);
-    }
-}
-
-void BambuFileGridModel::EnsureCards() const
-{
-    if (!m_dirty && (!m_fs || m_cards.size() == m_fs->GetCount()))
-        return;
-    m_dirty = false;
-    m_cards.clear();
-    if (!m_fs)
-        return;
-    size_t count = m_fs->GetCount();
-    m_cards.reserve(count);
-    for (size_t i = 0; i < count; ++i) {
-        bool selected = false;
-        PrinterFileSystem::File const &file = m_fs->GetFile(i, selected);
-        FileGridCard card;
-        card.id                = file.path;
-        card.name              = file.name;
-        card.title             = file.Title();
-        card.time_text         = file.Metadata("Time", "");
-        card.weight_text       = file.Metadata("Weight", "");
-        card.time              = file.time;
-        card.downloading       = file.IsDownload();
-        card.download_progress = file.DownloadProgress();
-        card.selected          = selected;
-        card.thumbnail         = file.thumbnail;
-        m_cards.push_back(std::move(card));
-    }
-}
-
-size_t BambuFileGridModel::GetCount() const
-{
-    return m_fs ? m_fs->GetCount() : 0;
-}
-
-const FileGridCard& BambuFileGridModel::GetFile(size_t index, bool& selected) const
-{
-    EnsureCards();
-    if (!m_fs || index >= m_cards.size()) {
-        selected = false;
-        return emptyCard();
-    }
-    m_fs->GetFile(index, selected);
-    return m_cards[index];
-}
-
-const FileGridCard& BambuFileGridModel::GetFile(size_t index) const
-{
-    EnsureCards();
-    if (index >= m_cards.size())
-        return emptyCard();
-    return m_cards[index];
-}
-
-FileGridType BambuFileGridModel::GetFileType() const
-{
-    return m_fs ? static_cast<FileGridType>(m_fs->GetFileType()) : FileGridType::Timelapse;
-}
-
-void BambuFileGridModel::SetFileType(FileGridType type, const std::string& storage)
-{
-    if (m_fs)
-        m_fs->SetFileType(static_cast<PrinterFileSystem::FileType>(type), storage);
-}
-
-FileGridGroup BambuFileGridModel::GetGroupMode() const
-{
-    return m_fs ? static_cast<FileGridGroup>(m_fs->GetGroupMode()) : FileGridGroup::All;
-}
-
-void BambuFileGridModel::SetGroupMode(FileGridGroup mode)
-{
-    if (m_fs)
-        m_fs->SetGroupMode(static_cast<PrinterFileSystem::GroupMode>(mode));
-}
-
-size_t BambuFileGridModel::GetIndexAtTime(time_t time) const
-{
-    return m_fs ? m_fs->GetIndexAtTime(static_cast<boost::uint32_t>(time)) : 0;
-}
-
-size_t BambuFileGridModel::EnterSubGroup(size_t index)
-{
-    return m_fs ? m_fs->EnterSubGroup(index) : index;
-}
-
-void BambuFileGridModel::ToggleSelect(size_t index)
-{
-    if (m_fs)
-        m_fs->ToggleSelect(index);
-}
-
-void BambuFileGridModel::SelectAll(bool select)
-{
-    if (m_fs)
-        m_fs->SelectAll(select);
-}
-
-void BambuFileGridModel::SetFocusRange(size_t start, size_t count)
-{
-    if (m_fs)
-        m_fs->SetFocusRange(start, count);
-}
-
-void BambuFileGridModel::Retry()
-{
-    if (m_fs)
-        m_fs->Retry();
-}
-
-int BambuFileGridModel::GetLastError() const
-{
-    return m_fs ? m_fs->GetLastError() : 1;
-}
-
-void BambuFileGridModel::DownloadCheckFiles(const std::string& path)
-{
-    if (m_fs)
-        m_fs->DownloadCheckFiles(path);
-}
-
-void BambuFileGridModel::SetChangeHandler(std::function<void(FileGridChange)> handler)
-{
-    m_handler = std::move(handler);
-}
-
-void BambuFileGridModel::notify(FileGridChange change)
-{
-    if (m_handler)
-        m_handler(change);
-}
-
-void BambuFileGridModel::onFileChanged(wxCommandEvent& evt)
-{
-    evt.Skip();
-    if (evt.GetInt() == -1 && m_fs)
-        m_fs->DownloadCheckFiles(wxGetApp().app_config->get("download_path"));
-    m_dirty = true;
-    notify(FileGridChange::Files);
-}
-
-void BambuFileGridModel::onModeChanged(wxCommandEvent& evt)
-{
-    evt.Skip();
-    m_dirty = true;
-    notify(FileGridChange::Mode);
-}
-
-void BambuFileGridModel::onThumbnail(wxCommandEvent& evt)
-{
-    evt.Skip();
-    m_dirty = true;
-    notify(FileGridChange::Thumbnail);
-}
-
-void BambuFileGridModel::onDownload(wxCommandEvent& evt)
-{
-    evt.Skip();
-    m_dirty = true;
-    notify(FileGridChange::Download);
-}
-
-}}
@@ -1,61 +0,0 @@
-#pragma once
-
-#include "IFileGridModel.h"
-#include "PrinterFileSystem.h"
-
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <wx/event.h>
-#include <cstddef>
-#include <ctime>
-#include <functional>
-#include <string>
-#include <vector>
-
-namespace Slic3r {
-namespace GUI {
-
-// IFileGridModel over PrinterFileSystem, behavior-identical to ImageGrid's direct use.
-class BambuFileGridModel : public wxEvtHandler, public IFileGridModel
-{
-public:
-    explicit BambuFileGridModel(boost::shared_ptr<PrinterFileSystem> fs);
-    ~BambuFileGridModel() override;
-
-    size_t GetCount() const override;
-    const FileGridCard& GetFile(size_t index, bool& selected) const override;
-    const FileGridCard& GetFile(size_t index) const override;
-
-    FileGridType  GetFileType() const override;
-    void          SetFileType(FileGridType type, const std::string& storage) override;
-    FileGridGroup GetGroupMode() const override;
-    void          SetGroupMode(FileGridGroup mode) override;
-
-    size_t GetIndexAtTime(time_t time) const override;
-    size_t EnterSubGroup(size_t index) override;
-
-    void ToggleSelect(size_t index) override;
-    void SelectAll(bool select) override;
-    void SetFocusRange(size_t start, size_t count) override;
-
-    void Retry() override;
-    int  GetLastError() const override;
-    void DownloadCheckFiles(const std::string& path) override;
-
-    void SetChangeHandler(std::function<void(FileGridChange)> handler) override;
-
-private:
-    void EnsureCards() const;
-    void notify(FileGridChange change);
-
-    void onFileChanged(wxCommandEvent& evt);
-    void onModeChanged(wxCommandEvent& evt);
-    void onThumbnail(wxCommandEvent& evt);
-    void onDownload(wxCommandEvent& evt);
-
-    boost::shared_ptr<PrinterFileSystem> m_fs;
-    std::function<void(FileGridChange)>  m_handler;
-    mutable std::vector<FileGridCard>    m_cards;
-    mutable bool                         m_dirty = true;
-};
-
-}}
@@ -1,67 +0,0 @@
-#pragma once
-
-#include <wx/bitmap.h>
-#include <cstddef>
-#include <ctime>
-#include <functional>
-#include <string>
-
-namespace Slic3r {
-namespace GUI {
-
-// Mirrors PrinterFileSystem::FileType ordering (F_TIMELAPSE=0, F_VIDEO=1, F_MODEL=2).
-enum class FileGridType { Timelapse = 0, Video = 1, Model = 2 };
-// Mirrors PrinterFileSystem::GroupMode ordering (G_NONE=0, G_MONTH=1, G_YEAR=2).
-enum class FileGridGroup { All = 0, Month = 1, Year = 2 };
-// Mirrors the PrinterFileSystem wx events ImageGrid listens to.
-enum class FileGridChange { Files, Mode, Thumbnail, Download };
-
-// One rendered card. Neutral: no Bambu transfer internals, no filesystem paths beyond id.
-struct FileGridCard {
-    std::string id;
-    std::string name;
-    std::string title;
-    std::string time_text;
-    std::string weight_text;
-    time_t      time = 0;
-    bool        downloading = false;
-    int         download_progress = 0; // -1 waiting, <0 failed, 0..100 progress
-    bool        selected = false;
-    bool        printable = true;
-    wxBitmap    thumbnail;
-};
-
-// Data source behind ImageGrid. Implemented today by BambuFileGridModel (wrapping
-// PrinterFileSystem); a non-Bambu model can implement the same surface later.
-class IFileGridModel {
-public:
-    virtual ~IFileGridModel() = default;
-
-    virtual size_t GetCount() const = 0;
-    virtual const FileGridCard& GetFile(size_t index, bool& selected) const = 0;
-    virtual const FileGridCard& GetFile(size_t index) const = 0;
-
-    virtual FileGridType  GetFileType() const = 0;
-    virtual void          SetFileType(FileGridType type, const std::string& storage) = 0;
-    virtual FileGridGroup GetGroupMode() const = 0;
-    virtual void          SetGroupMode(FileGridGroup mode) = 0;
-
-    // When true, the thumbnail is fitted inside the tile instead of stretched to fill it.
-    virtual bool preserve_thumbnail_aspect() const { return false; }
-
-    virtual size_t GetIndexAtTime(time_t time) const = 0;
-    virtual size_t EnterSubGroup(size_t index) = 0;
-
-    virtual void ToggleSelect(size_t index) = 0;
-    virtual void SelectAll(bool select) = 0;
-    virtual void SetFocusRange(size_t start, size_t count) = 0;
-
-    virtual void Retry() = 0;
-    virtual int  GetLastError() const = 0;
-    virtual void DownloadCheckFiles(const std::string& path) = 0;
-
-    // ImageGrid sets one handler; the model invokes it on the UI thread on change.
-    virtual void SetChangeHandler(std::function<void(FileGridChange)>) = 0;
-};
-
-}}
@@ -1,545 +0,0 @@
-#include "RemoteFileGridModel.h"
-
-#include "IPrinterAgent.hpp"
-#include "slic3r/GUI/GUI_App.hpp"
-#include "slic3r/Utils/NetworkAgent.hpp"
-
-#include <slic3r/GUI/Printer/IFileGridModel.h>
-#include <string>
-#include <cstdint>
-#include <memory>
-#include <vector>
-#include <ctime>
-#include <functional>
-#include <cstddef>
-#include <wx/datetime.h>
-#include <wx/gdicmn.h>
-#include <wx/image.h>
-#include <wx/mstream.h>
-
-#include <boost/format.hpp>
-#include <boost/regex.hpp>
-
-#include <algorithm>
-#include <cctype>
-#include <cmath>
-#include <utility>
-
-namespace Slic3r {
-namespace GUI {
-
-namespace {
-
-const FileGridCard& emptyCard()
-{
-    static const FileGridCard card;
-    return card;
-}
-
-// Same display format as PrinterFileSystem: "1d2h3m", dropping a leading "0d"/"0h".
-std::string durationString(long duration)
-{
-    static boost::regex rx("^0d(0h)?");
-    auto time = boost::format("%1%d%2%h%3%m") % (duration / 86400) % ((duration % 86400) / 3600) % ((duration % 3600) / 60);
-    return boost::regex_replace(time.str(), rx, "");
-}
-
-// Case-insensitive suffix test shared by the file filters below.
-bool ends_with_ci(const std::string& name, const std::string& suffix)
-{
-    return name.size() >= suffix.size() &&
-           std::equal(suffix.rbegin(), suffix.rend(), name.rbegin(),
-                      [](char a, char b) {
-                          return std::tolower(static_cast<unsigned char>(a)) ==
-                                 std::tolower(static_cast<unsigned char>(b));
-                      });
-}
-
-// .gcode / .3mf only, case-insensitive; a .gcode.3mf name matches via the .3mf suffix.
-bool is_displayable_file(const std::string& name)
-{
-    return ends_with_ci(name, ".gcode") || ends_with_ci(name, ".3mf");
-}
-
-// .gcode and .gcode.3mf are printable; OrcaSonar unpacks a 3MF to its plate
-// G-code. A bare .3mf is an unsliced project file, so it stays unprintable.
-bool is_printable_gcode(const std::string& name)
-{
-    return ends_with_ci(name, ".gcode") || ends_with_ci(name, ".gcode.3mf");
-}
-
-}
-
-RemoteFileGridModel::RemoteFileGridModel(std::string device_id)
-    : m_device_id(std::move(device_id))
-{
-}
-
-RemoteFileGridModel::~RemoteFileGridModel()
-{
-    m_lifetime.reset();
-}
-
-void RemoteFileGridModel::Refresh()
-{
-    const std::uint64_t request = ++m_request;
-    const std::string device_id = m_device_id;
-    m_thumbnail_cache.clear();
-    m_thumbnail_requested.clear();
-    m_thumbnail_queue.clear();
-    m_metadata_cache.clear();
-    m_metadata_requested.clear();
-    m_metadata_queue.clear();
-    for (FileGridCard& card : m_cards)
-        card.thumbnail = wxBitmap();
-    m_last_error = 0;
-    setStatus(Status::Loading);
-
-    NetworkAgent* agent = wxGetApp().getAgent();
-    if (!agent) {
-        m_last_error = -1;
-        m_cards.clear();
-        m_month.clear();
-        m_year.clear();
-        setStatus(Status::Failed);
-        if (m_change_handler)
-            m_change_handler(FileGridChange::Files);
-        return;
-    }
-
-    std::weak_ptr<int> lifetime = m_lifetime;
-    int result = agent->list_printer_files(device_id,
-        [this, lifetime, request, device_id](int result, std::vector<PrinterFileEntry> files) {
-            if (lifetime.expired())
-                return;
-            onFilesLoaded(request, device_id, result, std::move(files));
-        });
-
-    if (result != 0 && request == m_request && m_status == Status::Loading) {
-        m_last_error = result;
-        m_cards.clear();
-        m_month.clear();
-        m_year.clear();
-        setStatus(Status::Failed);
-        if (m_change_handler)
-            m_change_handler(FileGridChange::Files);
-    }
-}
-
-void RemoteFileGridModel::onFilesLoaded(std::uint64_t request, const std::string& device_id, int result,
-                                        std::vector<PrinterFileEntry> files)
-{
-    if (request != m_request || device_id != m_device_id)
-        return;
-
-    m_last_error = result;
-    m_cards.clear();
-    if (result == 0) {
-        files.erase(std::remove_if(files.begin(), files.end(),
-                                   [](const PrinterFileEntry& file) { return !is_displayable_file(file.name); }),
-                    files.end());
-        std::sort(files.begin(), files.end(), [](const PrinterFileEntry& lhs, const PrinterFileEntry& rhs) {
-            return lhs.modified > rhs.modified;
-        });
-        m_cards.reserve(files.size());
-        for (const PrinterFileEntry& file : files) {
-            FileGridCard card;
-            card.id = file.path;
-            card.name = file.name;
-            card.time = static_cast<time_t>(file.modified);
-            card.printable = is_printable_gcode(file.name);
-            m_cards.emplace_back(std::move(card));
-        }
-        buildGroups();
-        setStatus(m_cards.empty() ? Status::Empty : Status::Ready);
-    } else {
-        m_month.clear();
-        m_year.clear();
-        setStatus(Status::Failed);
-    }
-
-    if (m_change_handler)
-        m_change_handler(FileGridChange::Files);
-}
-
-void RemoteFileGridModel::setStatus(Status status)
-{
-    m_status = status;
-    if (m_status_handler)
-        m_status_handler(status);
-}
-
-void RemoteFileGridModel::SetStatusHandler(std::function<void(Status)> handler)
-{
-    m_status_handler = std::move(handler);
-}
-
-size_t RemoteFileGridModel::GetCount() const
-{
-    if (m_group_mode == FileGridGroup::Year)
-        return m_year.size();
-    if (m_group_mode == FileGridGroup::Month)
-        return m_month.size();
-    return m_cards.size();
-}
-
-const FileGridCard& RemoteFileGridModel::GetFile(size_t index, bool& selected) const
-{
-    selected = false;
-    const size_t card_index = cardIndexForGroup(index);
-    if (card_index >= m_cards.size())
-        return emptyCard();
-    FileGridCard& card = m_cards[card_index];
-    const auto thumbnail = m_thumbnail_cache.find(card.id);
-    card.thumbnail = thumbnail == m_thumbnail_cache.end() ? wxBitmap() : thumbnail->second;
-    return card;
-}
-
-const FileGridCard& RemoteFileGridModel::GetFile(size_t index) const
-{
-    bool selected = false;
-    return GetFile(index, selected);
-}
-
-size_t RemoteFileGridModel::cardIndexForGroup(size_t index) const
-{
-    if (m_group_mode == FileGridGroup::All)
-        return index;
-    if (m_group_mode == FileGridGroup::Month)
-        return index < m_month.size() ? m_month[index] : m_cards.size();
-    return index < m_year.size() && m_year[index] < m_month.size() ? m_month[m_year[index]] : m_cards.size();
-}
-
-FileGridType RemoteFileGridModel::GetFileType() const
-{
-    return m_file_type;
-}
-
-void RemoteFileGridModel::SetFileType(FileGridType type, const std::string&)
-{
-    m_file_type = type;
-}
-
-FileGridGroup RemoteFileGridModel::GetGroupMode() const
-{
-    return m_group_mode;
-}
-
-void RemoteFileGridModel::SetGroupMode(FileGridGroup mode)
-{
-    if (mode != FileGridGroup::All && mode != FileGridGroup::Month && mode != FileGridGroup::Year)
-        return;
-    if (m_group_mode == mode)
-        return;
-    m_group_mode = mode;
-    if (m_group_mode_handler)
-        m_group_mode_handler(mode);
-    if (m_change_handler)
-        m_change_handler(FileGridChange::Mode);
-}
-
-size_t RemoteFileGridModel::GetIndexAtTime(time_t time) const
-{
-    if (m_cards.empty())
-        return 0;
-
-    size_t low = 0;
-    size_t high = m_cards.size();
-    while (low < high) {
-        const size_t middle = low + (high - low) / 2;
-        if (m_cards[middle].time >= time)
-            low = middle + 1;
-        else
-            high = middle;
-    }
-    const size_t card_index = low == 0 ? 0 : low - 1;
-    if (m_group_mode == FileGridGroup::All)
-        return card_index;
-
-    const auto month = std::upper_bound(m_month.begin(), m_month.end(), card_index);
-    const size_t month_index = month == m_month.begin() ? 0 : static_cast<size_t>(month - m_month.begin() - 1);
-    if (m_group_mode == FileGridGroup::Month)
-        return month_index;
-
-    const auto year = std::upper_bound(m_year.begin(), m_year.end(), card_index,
-        [this](size_t file_index, size_t month_index) {
-            return file_index < m_month[month_index];
-        });
-    return year == m_year.begin() ? 0 : static_cast<size_t>(year - m_year.begin() - 1);
-}
-
-size_t RemoteFileGridModel::EnterSubGroup(size_t index)
-{
-    if (m_group_mode == FileGridGroup::All)
-        return index;
-    if (m_group_mode == FileGridGroup::Year) {
-        if (index >= m_year.size())
-            return 0;
-        index = m_year[index];
-    } else {
-        if (index >= m_month.size())
-            return 0;
-        index = m_month[index];
-    }
-    SetGroupMode(static_cast<FileGridGroup>(static_cast<int>(m_group_mode) - 1));
-    return index;
-}
-
-void RemoteFileGridModel::ToggleSelect(size_t)
-{
-}
-
-void RemoteFileGridModel::SelectAll(bool)
-{
-}
-
-void RemoteFileGridModel::SetFocusRange(size_t start, size_t count)
-{
-    if (m_status == Status::Loading || start >= GetCount())
-        return;
-    const size_t end = start + std::min(count, GetCount() - start);
-    for (size_t i = start; i < end; ++i) {
-        const FileGridCard& card = GetFile(i);
-        if (!card.id.empty()) {
-            requestThumbnail(card.id);
-            requestMetadata(card.id);
-        }
-    }
-    pumpThumbnailQueue();
-    pumpMetadataQueue();
-}
-
-void RemoteFileGridModel::Retry()
-{
-    Refresh();
-}
-
-int RemoteFileGridModel::GetLastError() const
-{
-    return m_last_error;
-}
-
-void RemoteFileGridModel::DownloadCheckFiles(const std::string&)
-{
-}
-
-void RemoteFileGridModel::DeleteFile(const std::string& path, std::function<void(bool ok)> done)
-{
-    NetworkAgent* agent = wxGetApp().getAgent();
-    if (!agent || m_device_id.empty() || path.empty()) {
-        if (done)
-            done(false);
-        return;
-    }
-
-    const std::uint64_t request = m_request;
-    const std::string device_id = m_device_id;
-    const std::weak_ptr<int> lifetime = m_lifetime;
-    const auto completed = std::make_shared<bool>(false);
-    auto finish = [this, lifetime, completed, request, device_id, path, done = std::move(done)](int result) {
-        if (*completed)
-            return;
-        *completed = true;
-        if (lifetime.expired())
-            return;
-
-        const bool ok = result == 0;
-        if (ok && request == m_request && device_id == m_device_id) {
-            m_thumbnail_cache.erase(path);
-            m_thumbnail_requested.erase(path);
-            m_cards.erase(std::remove_if(m_cards.begin(), m_cards.end(),
-                                         [&path](const FileGridCard& card) { return card.id == path; }),
-                          m_cards.end());
-            buildGroups();
-            setStatus(m_cards.empty() ? Status::Empty : Status::Ready);
-            if (m_change_handler)
-                m_change_handler(FileGridChange::Files);
-        }
-        if (done)
-            done(ok);
-    };
-
-    const int result = agent->delete_printer_file(device_id, path, finish);
-    if (result != 0)
-        finish(result);
-}
-
-void RemoteFileGridModel::SetChangeHandler(std::function<void(FileGridChange)> handler)
-{
-    m_change_handler = std::move(handler);
-}
-
-void RemoteFileGridModel::SetGroupModeHandler(std::function<void(FileGridGroup)> handler)
-{
-    m_group_mode_handler = std::move(handler);
-}
-
-void RemoteFileGridModel::buildGroups()
-{
-    m_month.clear();
-    m_year.clear();
-    if (m_cards.empty())
-        return;
-
-    m_month.push_back(0);
-    m_year.push_back(0);
-    wxDateTime previous(static_cast<time_t>(m_cards.front().time));
-    for (size_t i = 1; i < m_cards.size(); ++i) {
-        const wxDateTime current(static_cast<time_t>(m_cards[i].time));
-        if (current.GetYear() != previous.GetYear()) {
-            m_year.push_back(m_month.size());
-            m_month.push_back(i);
-        } else if (current.GetMonth() != previous.GetMonth()) {
-            m_month.push_back(i);
-        }
-        previous = current;
-    }
-}
-
-void RemoteFileGridModel::requestThumbnail(const std::string& path)
-{
-    if (m_thumbnail_cache.find(path) != m_thumbnail_cache.end() || !m_thumbnail_requested.insert(path).second)
-        return;
-    m_thumbnail_queue.push_back(path);
-}
-
-void RemoteFileGridModel::pumpThumbnailQueue()
-{
-    constexpr size_t MAX_THUMBNAIL_REQUESTS = 4;
-    if (m_pumping_thumbnail_queue)
-        return;
-    m_pumping_thumbnail_queue = true;
-
-    NetworkAgent* agent = wxGetApp().getAgent();
-    if (!agent) {
-        while (!m_thumbnail_queue.empty()) {
-            m_thumbnail_cache.emplace(m_thumbnail_queue.front(), wxBitmap());
-            m_thumbnail_queue.pop_front();
-        }
-        m_pumping_thumbnail_queue = false;
-        return;
-    }
-
-    while (!m_thumbnail_queue.empty() && m_thumbnail_requests_in_flight < MAX_THUMBNAIL_REQUESTS) {
-        std::string path = std::move(m_thumbnail_queue.front());
-        m_thumbnail_queue.pop_front();
-        ++m_thumbnail_requests_in_flight;
-
-        const std::uint64_t request = m_request;
-        const std::string device_id = m_device_id;
-        const std::weak_ptr<int> lifetime = m_lifetime;
-        const auto completed = std::make_shared<bool>(false);
-        auto finish = [this, lifetime, completed, request, device_id, path](int result, std::string image) {
-            if (*completed)
-                return;
-            *completed = true;
-            if (lifetime.expired())
-                return;
-            onThumbnailLoaded(request, device_id, path, result, std::move(image));
-        };
-
-        const int result = agent->get_printer_file_thumbnail(device_id, path, finish);
-        if (result != 0)
-            finish(result, {});
-    }
-    m_pumping_thumbnail_queue = false;
-}
-
-void RemoteFileGridModel::onThumbnailLoaded(std::uint64_t request, const std::string& device_id,
-                                            const std::string& path, int result, std::string image)
-{
-    if (m_thumbnail_requests_in_flight > 0)
-        --m_thumbnail_requests_in_flight;
-
-    if (request == m_request && device_id == m_device_id) {
-        wxBitmap bitmap;
-        if (result == 0 && !image.empty()) {
-            wxMemoryInputStream stream(image.data(), image.size());
-            wxImage decoded(stream, wxBITMAP_TYPE_ANY);
-            if (decoded.IsOk())
-                bitmap = wxBitmap(decoded);
-        }
-        m_thumbnail_cache[path] = std::move(bitmap);
-        if (m_change_handler)
-            m_change_handler(FileGridChange::Thumbnail);
-    }
-
-    pumpThumbnailQueue();
-}
-
-void RemoteFileGridModel::requestMetadata(const std::string& path)
-{
-    if (m_metadata_cache.find(path) != m_metadata_cache.end() || !m_metadata_requested.insert(path).second)
-        return;
-    m_metadata_queue.push_back(path);
-}
-
-void RemoteFileGridModel::pumpMetadataQueue()
-{
-    constexpr size_t MAX_METADATA_REQUESTS = 4;
-    if (m_pumping_metadata_queue)
-        return;
-    m_pumping_metadata_queue = true;
-
-    NetworkAgent* agent = wxGetApp().getAgent();
-    if (!agent) {
-        while (!m_metadata_queue.empty()) {
-            m_metadata_cache.emplace(m_metadata_queue.front(), PrinterFileMetadata{});
-            m_metadata_queue.pop_front();
-        }
-        m_pumping_metadata_queue = false;
-        return;
-    }
-
-    while (!m_metadata_queue.empty() && m_metadata_requests_in_flight < MAX_METADATA_REQUESTS) {
-        std::string path = std::move(m_metadata_queue.front());
-        m_metadata_queue.pop_front();
-        ++m_metadata_requests_in_flight;
-
-        const std::uint64_t request = m_request;
-        const std::string device_id = m_device_id;
-        const std::weak_ptr<int> lifetime = m_lifetime;
-        const auto completed = std::make_shared<bool>(false);
-        auto finish = [this, lifetime, completed, request, device_id, path](int result, PrinterFileMetadata meta) {
-            if (*completed)
-                return;
-            *completed = true;
-            if (lifetime.expired())
-                return;
-            onMetadataLoaded(request, device_id, path, result, meta);
-        };
-
-        const int result = agent->get_printer_file_metadata(device_id, path, finish);
-        if (result != 0)
-            finish(result, {});
-    }
-    m_pumping_metadata_queue = false;
-}
-
-void RemoteFileGridModel::onMetadataLoaded(std::uint64_t request, const std::string& device_id,
-                                           const std::string& path, int result, PrinterFileMetadata meta)
-{
-    if (m_metadata_requests_in_flight > 0)
-        --m_metadata_requests_in_flight;
-
-    if (request == m_request && device_id == m_device_id) {
-        m_metadata_cache[path] = meta;
-        if (result == 0) {
-            for (FileGridCard& card : m_cards) {
-                if (card.id != path)
-                    continue;
-                card.time_text   = meta.estimated_time > 0 ? durationString(meta.estimated_time) : std::string();
-                card.weight_text = meta.filament_weight > 0
-                                       ? std::to_string(int(std::round(meta.filament_weight))) + 'g'
-                                       : std::string();
-                break;
-            }
-            if (m_change_handler)
-                m_change_handler(FileGridChange::Thumbnail);
-        }
-    }
-
-    pumpMetadataQueue();
-}
-
-}}
@@ -1,100 +0,0 @@
-#pragma once
-
-#include "IFileGridModel.h"
-
-#include "slic3r/Utils/IPrinterAgent.hpp"
-
-#include <cstddef>
-#include <cstdint>
-#include <ctime>
-#include <deque>
-#include <functional>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-namespace Slic3r {
-namespace GUI {
-
-class RemoteFileGridModel : public IFileGridModel
-{
-public:
-    enum class Status { Loading, Ready, Empty, Failed };
-
-    explicit RemoteFileGridModel(std::string device_id);
-    ~RemoteFileGridModel() override;
-
-    void Refresh();
-    Status GetStatus() const { return m_status; }
-    void SetStatusHandler(std::function<void(Status)> handler);
-    void SetGroupModeHandler(std::function<void(FileGridGroup)> handler);
-
-    size_t GetCount() const override;
-    const FileGridCard& GetFile(size_t index, bool& selected) const override;
-    const FileGridCard& GetFile(size_t index) const override;
-
-    FileGridType GetFileType() const override;
-    void SetFileType(FileGridType type, const std::string& storage) override;
-    FileGridGroup GetGroupMode() const override;
-    void SetGroupMode(FileGridGroup mode) override;
-
-    size_t GetIndexAtTime(time_t time) const override;
-    size_t EnterSubGroup(size_t index) override;
-
-    void ToggleSelect(size_t index) override;
-    void SelectAll(bool select) override;
-    void SetFocusRange(size_t start, size_t count) override;
-
-    void Retry() override;
-    int GetLastError() const override;
-    void DownloadCheckFiles(const std::string& path) override;
-    bool preserve_thumbnail_aspect() const override { return true; }
-
-    // Delete `path` from the printer; `done` reports success on the UI thread.
-    void DeleteFile(const std::string& path, std::function<void(bool ok)> done);
-
-    void SetChangeHandler(std::function<void(FileGridChange)> handler) override;
-
-private:
-    void setStatus(Status status);
-    void onFilesLoaded(std::uint64_t request, const std::string& device_id, int result,
-                       std::vector<PrinterFileEntry> files);
-    void buildGroups();
-    size_t cardIndexForGroup(size_t index) const;
-    void requestThumbnail(const std::string& path);
-    void pumpThumbnailQueue();
-    void onThumbnailLoaded(std::uint64_t request, const std::string& device_id,
-                           const std::string& path, int result, std::string image);
-    void requestMetadata(const std::string& path);
-    void pumpMetadataQueue();
-    void onMetadataLoaded(std::uint64_t request, const std::string& device_id,
-                          const std::string& path, int result, PrinterFileMetadata meta);
-
-    std::string m_device_id;
-    mutable std::vector<FileGridCard> m_cards;
-    std::vector<size_t> m_month;
-    std::vector<size_t> m_year;
-    std::function<void(FileGridChange)> m_change_handler;
-    std::function<void(Status)> m_status_handler;
-    std::function<void(FileGridGroup)> m_group_mode_handler;
-    std::shared_ptr<int> m_lifetime = std::make_shared<int>(0);
-    std::unordered_map<std::string, wxBitmap> m_thumbnail_cache;
-    std::unordered_set<std::string> m_thumbnail_requested;
-    std::deque<std::string> m_thumbnail_queue;
-    std::unordered_map<std::string, PrinterFileMetadata> m_metadata_cache;
-    std::unordered_set<std::string> m_metadata_requested;
-    std::deque<std::string> m_metadata_queue;
-    std::uint64_t m_request = 0;
-    size_t m_thumbnail_requests_in_flight = 0;
-    bool m_pumping_thumbnail_queue = false;
-    size_t m_metadata_requests_in_flight = 0;
-    bool m_pumping_metadata_queue = false;
-    int m_last_error = 0;
-    FileGridType m_file_type = FileGridType::Timelapse;
-    FileGridGroup m_group_mode = FileGridGroup::All;
-    Status m_status = Status::Loading;
-};
-
-}}
@@ -36,8 +36,6 @@
 #include "libslic3r/MultiNozzleUtils.hpp" // filament-change-gap model for the best-position popup
 #include "BackgroundSlicingProcess.hpp"   // complete type for background_process().get_current_gcode_result()
 #include "DeviceCore/DevStorage.h"
-#include "slic3r/Utils/NetworkAgentFactory.hpp"
-#include "FilamentMappingUtils.hpp"

 #include <wx/event.h>
 #include <string>
@@ -3570,9 +3568,6 @@ void SelectMachineDialog::navigate_to_timelapse_page()
    this->EndModal(wxID_CANCEL);
 }

-// Mapping helpers live in FilamentMappingUtils.hpp (shared with
-// SendMultiMachinePage); they mirror the agent serializer exactly.
-
 void SelectMachineDialog::on_send_print()
 {
    BOOST_LOG_TRIVIAL(info) << "print_job: on_ok to send";
@@ -3627,28 +3622,6 @@ void SelectMachineDialog::on_send_print()

    get_ams_mapping_result(ams_mapping_array,ams_mapping_array2, ams_mapping_info);

-    // The policy lives in FilamentMappingUtils.hpp; this dialog only differs
-    // from the multi-device page in how it reports a refusal.
-    switch (prepare_filament_mapping_for_send(obj_, ams_mapping_array2, m_ams_mapping_result)) {
-    case MappingSendError::unsupported:
-        BOOST_LOG_TRIVIAL(warning) << "print_job: connector does not advertise filament_mapping; refusing mapped print";
-        m_status_bar->set_status_text(_L("AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."));
-        Enable_Send_Button(true);
-        return;
-    case MappingSendError::incomplete:
-        BOOST_LOG_TRIVIAL(warning) << "print_job: a used filament has no AMS target; refusing print";
-        m_status_bar->set_status_text(_L("A filament used by this print has no AMS mapping. Assign it before printing."));
-        Enable_Send_Button(true);
-        return;
-    case MappingSendError::none:
-        break;
-    default:
-        // A refusal added without a handler here must not silently send.
-        BOOST_LOG_TRIVIAL(warning) << "print_job: unrecognized mapping refusal; refusing print";
-        Enable_Send_Button(true);
-        return;
-    }
-
    if (m_print_type == PrintFromType::FROM_NORMAL) {
        result = m_plater->send_gcode(m_print_plate_idx, [this](int export_stage, int current, int total, bool& cancel) {
            if (this->m_is_canceled) return;
@@ -8,7 +8,6 @@

 #include "GUI.hpp"
 #include "GUI_App.hpp"
-#include "slic3r/Utils/NetworkAgent.hpp"
 #include "GUI_Preview.hpp"
 #include "MainFrame.hpp"
 #include "Widgets/ProgressDialog.hpp"
@@ -848,8 +847,8 @@ void SelectMachinePopup::update_machine_list(wxCommandEvent &event)

 void SelectMachinePopup::start_ssdp(bool start)
 {
-    if (auto* agent = wxGetApp().getAgent())
-        agent->start_discovery(true, start);
+    return;
+    //if (wxGetApp().getAgent()) { wxGetApp().getAgent()->start_discovery(true, start); }
 }

 void SelectMachinePopup::OnLeftUp(wxMouseEvent &event)
@@ -61,10 +61,6 @@

 #include "DeviceCore/DevManager.h"
 #include "DeviceCore/DevStorage.h"
-
-#include "slic3r/Utils/NetworkAgentFactory.hpp"
-#include "FilamentMappingUtils.hpp"
-
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "libslic3r/Model.hpp"
@@ -764,8 +760,6 @@ bool SendMultiMachinePage::get_ams_mapping_result(std::string &mapping_array_str
    return true;
 }

-// Mapping helpers live in FilamentMappingUtils.hpp, shared with SelectMachine.
-
 void SendMultiMachinePage::on_send(wxCommandEvent& event)
 {
    event.Skip();
@@ -814,30 +808,6 @@ void SendMultiMachinePage::on_send(wxCommandEvent& event)

            if (!wxGetApp().is_blocking_printing(obj)) {
                PrintParams params = request_params(obj);
-                switch (prepare_filament_mapping_for_send(obj, params.ams_mapping2, m_ams_mapping_result)) {
-                case MappingSendError::unsupported:
-                {
-                    BOOST_LOG_TRIVIAL(warning) << "SendMultiMachinePage: connector does not advertise filament_mapping; refusing mapped print for "
-                                               << obj->get_dev_id();
-                    MessageDialog unavailable_msg(nullptr, _L("AMS filament mapping is not available for this printer. Clear the AMS mapping before printing."), "", wxICON_WARNING | wxOK);
-                    unavailable_msg.ShowModal();
-                    return;
-                }
-                case MappingSendError::incomplete:
-                {
-                    BOOST_LOG_TRIVIAL(warning) << "SendMultiMachinePage: a used filament has no target; refusing print for " << obj->get_dev_id();
-                    MessageDialog incomplete_msg(nullptr, _L("A filament used by this print has no AMS mapping. Assign it before printing."), "", wxICON_WARNING | wxOK);
-                    incomplete_msg.ShowModal();
-                    return;
-                }
-                case MappingSendError::none:
-                    break;
-                default:
-                    // A refusal added without a handler here must not silently send.
-                    BOOST_LOG_TRIVIAL(warning) << "SendMultiMachinePage: unrecognized mapping refusal for "
-                                               << obj->get_dev_id();
-                    return;
-                }
                print_params.push_back(params);
            }
        }
@@ -4695,14 +4695,12 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
                }

                m_filament_setting_dlg->m_is_third = !DevFilaSystem::IsBBL_Filament(tray->tag_uid);
-                // The tray's own temps pre-fill the dialog for every tray type; a BBL tray
-                // additionally carries the SN and brand.
-                temp_max = tray->nozzle_temp_max;
-                temp_min = tray->nozzle_temp_min;
                if (!m_filament_setting_dlg->m_is_third)
                {
                    sn_number = tray->uuid;
                    filament = tray->sub_brands;
+                    temp_max = tray->nozzle_temp_max;
+                    temp_min = tray->nozzle_temp_min;
                }
            }

@@ -4763,11 +4761,11 @@ void StatusPanel::on_ext_spool_edit(wxCommandEvent &event)
            }

            m_filament_setting_dlg->m_is_third = !DevFilaSystem::IsBBL_Filament(obj->vt_slot[nozzle_index].tag_uid);
-            temp_max = obj->vt_slot[nozzle_index].nozzle_temp_max;
-            temp_min = obj->vt_slot[nozzle_index].nozzle_temp_min;
            if (!m_filament_setting_dlg->m_is_third) {
                sn_number = obj->vt_slot[nozzle_index].uuid;
                filament  = obj->vt_slot[nozzle_index].sub_brands;
+                temp_max  = obj->vt_slot[nozzle_index].nozzle_temp_max;
+                temp_min  = obj->vt_slot[nozzle_index].nozzle_temp_min;
            }

            m_filament_setting_dlg->Move(wxPoint(current_position_x,current_position_y));
@@ -1,112 +0,0 @@
-#include "StoragePanel.h"
-
-#include "DeviceManager.hpp"
-#include "GUI_App.hpp"
-#include "MediaFilePanel.h"
-#include "OrcaFilesPanel.h"
-#include "Widgets/StateColor.hpp"
-
-#include <wx/colour.h>
-#include <wx/panel.h>
-#include <wx/event.h>
-#include <wx/sizer.h>
-
-namespace Slic3r {
-namespace GUI {
-
-StoragePanel::StoragePanel(wxWindow* parent)
-    : wxPanel(parent, wxID_ANY)
-{
-    const wxColour light_background("#EEEEEE");
-    SetBackgroundColour(wxGetApp().dark_mode() ? StateColor::darkModeColorFor(light_background) : light_background);
-    SetSizer(new wxBoxSizer(wxVERTICAL));
-}
-
-MediaFilePanel* StoragePanel::ensureBambuPanel()
-{
-    if (!m_bambu_panel) {
-        m_bambu_panel = new MediaFilePanel(this);
-        m_bambu_panel->Hide();
-        GetSizer()->Add(m_bambu_panel, 1, wxEXPAND);
-        wxGetApp().UpdateDarkUIWin(m_bambu_panel);
-    }
-    return m_bambu_panel;
-}
-
-OrcaFilesPanel* StoragePanel::ensureOrcaPanel()
-{
-    if (!m_orca_panel) {
-        m_orca_panel = new OrcaFilesPanel(this);
-        m_orca_panel->Hide();
-        GetSizer()->Add(m_orca_panel, 1, wxEXPAND);
-        wxGetApp().UpdateDarkUIWin(m_orca_panel);
-    }
-    return m_orca_panel;
-}
-
-void StoragePanel::showChild(Child child)
-{
-    if (m_bambu_panel)
-        m_bambu_panel->Show(child == Child::Bambu);
-    if (m_orca_panel)
-        m_orca_panel->Show(child == Child::Orca);
-    m_active_child = child;
-    Layout();
-}
-
-void StoragePanel::UpdateByObj(MachineObject* obj)
-{
-    // Agent capability controls the page; Bambu remains the fallback for other printers.
-    Child target = m_active_child;
-    if (obj)
-        target = obj->printer_supports_feature("printer_files") ? Child::Orca : Child::Bambu;
-    else if (target == Child::None)
-        target = Child::Bambu;
-
-    if (target != m_active_child) {
-        if (m_active_child == Child::Bambu && m_bambu_panel)
-            m_bambu_panel->UpdateByObj(nullptr);
-        else if (m_active_child == Child::Orca && m_orca_panel)
-            m_orca_panel->UpdateByObj(nullptr);
-
-        if (target == Child::Bambu)
-            ensureBambuPanel();
-        else
-            ensureOrcaPanel();
-        showChild(target);
-    }
-
-    if (target == Child::Bambu)
-        ensureBambuPanel()->UpdateByObj(obj);
-    else if (target == Child::Orca)
-        ensureOrcaPanel()->UpdateByObj(obj);
-}
-
-void StoragePanel::SwitchStorage(bool external)
-{
-    if (m_bambu_panel)
-        m_bambu_panel->SwitchStorage(external);
-}
-
-void StoragePanel::Rescale()
-{
-    if (m_bambu_panel)
-        m_bambu_panel->Rescale();
-    if (m_orca_panel)
-        m_orca_panel->Rescale();
-}
-
-void StoragePanel::on_sys_color_changed()
-{
-    const wxColour light_background("#EEEEEE");
-    SetBackgroundColour(wxGetApp().dark_mode() ? StateColor::darkModeColorFor(light_background) : light_background);
-    if (m_bambu_panel)
-        wxGetApp().UpdateDarkUIWin(m_bambu_panel);
-    if (m_orca_panel)
-        wxGetApp().UpdateDarkUIWin(m_orca_panel);
-    if (m_orca_panel)
-        m_orca_panel->on_sys_color_changed();
-    Refresh();
-}
-
-}}
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <wx/panel.h>
-
-namespace Slic3r {
-class MachineObject;
-
-namespace GUI {
-
-class MediaFilePanel;
-class OrcaFilesPanel;
-
-class StoragePanel : public wxPanel
-{
-public:
-    explicit StoragePanel(wxWindow* parent);
-
-    void UpdateByObj(MachineObject* obj);
-    void SwitchStorage(bool external);
-    void Rescale();
-    void on_sys_color_changed();
-
-private:
-    enum class Child { None, Bambu, Orca };
-
-    MediaFilePanel* ensureBambuPanel();
-    OrcaFilesPanel* ensureOrcaPanel();
-    void showChild(Child child);
-
-    MediaFilePanel* m_bambu_panel = nullptr;
-    OrcaFilesPanel* m_orca_panel = nullptr;
-    Child m_active_child = Child::None;
-};
-
-}}
@@ -1425,12 +1425,6 @@ bool SyncAmsInfoDialog::get_ams_mapping_result(std::string &mapping_array_str, s
            BOOST_LOG_TRIVIAL(error) << "get_ams_mapping_result, plater is nullptr";
        }

-        // mapping_v1_json is built one entry per filament preset, in preset order, so the
-        // array position is the logical filament index the generated G-code toolchange
-        // references (the identifier handed to the Klipper toolchange macro; see
-        // OrcaPrinterAgent::build_filament_mapping and the index-correlation test in
-        // tests/slic3rutils/test_orca_printer_agent.cpp). Never re-densify after dropping
-        // sentinel entries, or a used filament would be aimed at the wrong lane.
        for (int i = 0; i < wxGetApp().preset_bundle->filament_presets.size(); i++) {
            int  tray_id = -1;
            json mapping_item_v1;
@@ -1,232 +0,0 @@
-#include "SysInfoDialog.hpp"
-#include "I18N.hpp"
-#include "3DScene.hpp"
-#include "GUI.hpp"
-#include "../Utils/UndoRedo.hpp"
-#include "Plater.hpp"
-
-#include <string>
-
-#include <Eigen/Core>
-
-#include <wx/clipbrd.h>
-#include <wx/platinfo.h>
-#include "GUI_App.hpp"
-#include "MainFrame.hpp"
-#include "wxExtensions.hpp"
-#include "libslic3r/BlacklistedLibraryCheck.hpp"
-#include "libslic3r/Color.hpp"
-#include "format.hpp"
-
-#ifdef _WIN32
-	// The standard Windows includes.
-	#define WIN32_LEAN_AND_MEAN
-	#ifndef NOMINMAX
-	#define NOMINMAX
-	#endif
-	#include <Windows.h>
-	#include <psapi.h>
-#endif /* _WIN32 */
-
-namespace Slic3r {
-namespace GUI {
-
-std::string get_main_info(bool format_as_html)
-{
-    std::stringstream out;
-
-    std::string b_start  = format_as_html ? "<b>"  : "";
-    std::string b_end    = format_as_html ? "</b>" : "";
-    std::string line_end = format_as_html ? "<br>" : "\n";
-
-    if (!format_as_html)
-        out << b_start << (wxGetApp().is_editor() ? SLIC3R_APP_FULL_NAME : GCODEVIEWER_APP_NAME) << b_end << line_end;
-    out << b_start << "Version:   "             << b_end << SLIC3R_VERSION << line_end;
-    out << b_start << "Build:     " << b_end << (wxGetApp().is_editor() ? SLIC3R_BUILD_ID : GCODEVIEWER_BUILD_ID) << line_end;
-    out << line_end;
-    out << b_start << "Operating System:    "   << b_end << wxPlatformInfo::Get().GetOperatingSystemFamilyName() << line_end;
-    out << b_start << "System Architecture: "   << b_end << wxPlatformInfo::Get().GetArchName() << line_end;
-    out << b_start <<
-#if defined _WIN32
-        "Windows Version:     "
-#else
-        // Hopefully some kind of unix / linux.
-        "System Version:      "
-#endif
-        << b_end << wxPlatformInfo::Get().GetOperatingSystemDescription() << line_end;
-    out << b_start << "Total RAM size [MB]: "  << b_end << Slic3r::format_memsize_MB(Slic3r::total_physical_memory());
-
-    return out.str();
-}
-
-std::string get_mem_info(bool format_as_html)
-{
-    std::stringstream out;
-
-    std::string b_start  = format_as_html ? "<b>"  : "";
-    std::string b_end    = format_as_html ? "</b>" : "";
-    std::string line_end = format_as_html ? "<br>" : "\n";
-
-    std::string mem_info_str = log_memory_info(true);
-    std::istringstream mem_info(mem_info_str);
-    std::string value;
-    while (std::getline(mem_info, value, ':')) {
-        out << b_start << (value+": ") << b_end;
-        std::getline(mem_info, value, ';');
-        out << value << line_end;
-    }
-
-    const Slic3r::UndoRedo::Stack &stack = wxGetApp().plater()->undo_redo_stack_main();
-    out << b_start << "RAM size reserved for the Undo / Redo stack: "  << b_end << Slic3r::format_memsize_MB(stack.get_memory_limit()) << line_end;
-    out << b_start << "RAM size occupied by the Undo / Redo stack: "  << b_end << Slic3r::format_memsize_MB(stack.memsize()) << line_end << line_end;
-
-    return out.str();
-}
-
-SysInfoDialog::SysInfoDialog()
-    : DPIDialog(static_cast<wxWindow*>(wxGetApp().mainframe), wxID_ANY, (wxGetApp().is_editor() ? wxString(SLIC3R_APP_FULL_NAME) : wxString(GCODEVIEWER_APP_NAME)) + " - " + _L("System Information"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
-{
-	wxColour bgr_clr = wxGetApp().get_window_default_clr();//wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-	SetBackgroundColour(bgr_clr);
-    SetFont(wxGetApp().normal_font());
-
-    wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL);
-    hsizer->SetMinSize(wxSize(50 * wxGetApp().em_unit(), -1));
-
-	auto main_sizer = new wxBoxSizer(wxVERTICAL);
-	main_sizer->Add(hsizer, 1, wxEXPAND | wxALL, 10);
-
-    // logo
-    m_logo_bmp = ScalableBitmap(this, wxGetApp().logo_name(), 192);
-    m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bmp.bmp());
-	hsizer->Add(m_logo, 0, wxALIGN_CENTER_VERTICAL);
-
-    wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL);
-    hsizer->Add(vsizer, 1, wxEXPAND|wxLEFT, 20);
-
-    // title
-    {
-        wxStaticText* title = new wxStaticText(this, wxID_ANY, wxGetApp().is_editor() ? SLIC3R_APP_FULL_NAME : GCODEVIEWER_APP_NAME, wxDefaultPosition, wxDefaultSize);
-        wxFont title_font = wxGetApp().bold_font();
-        title_font.SetFamily(wxFONTFAMILY_ROMAN);
-        title_font.SetPointSize(22);
-        title->SetFont(title_font);
-        vsizer->Add(title, 0, wxEXPAND | wxTOP, wxGetApp().em_unit()/*50*/);
-    }
-
-    // main_info_text
-    wxFont font = get_default_font(this);
-    const auto text_clr = wxGetApp().get_label_clr_default();//wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-    auto text_clr_str = encode_color(ColorRGB(text_clr.Red(), text_clr.Green(), text_clr.Blue()));
-    auto bgr_clr_str = encode_color(ColorRGB(bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue()));
-
-    const int fs = font.GetPointSize() - 1;
-    int size[] = { static_cast<int>(fs*1.5), static_cast<int>(fs*1.4), static_cast<int>(fs*1.3), fs, fs, fs, fs };
-
-    m_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER);
-    {
-        m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
-        m_html->SetBorders(2);
-		const auto text = wxString::Format(
-            "<html>"
-            "<body bgcolor= %s link= %s>"
-            "<font color=%s>"
-            "%s"
-            "</font>"
-            "</body>"
-            "</html>", bgr_clr_str, text_clr_str, text_clr_str,
-            get_main_info(true));
-        m_html->SetPage(text);
-        vsizer->Add(m_html, 1, wxEXPAND | wxBOTTOM, wxGetApp().em_unit());
-    }
-
-    // opengl_info
-    m_opengl_info_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
-    {
-        m_opengl_info_html->SetMinSize(wxSize(-1, 16 * wxGetApp().em_unit()));
-        m_opengl_info_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
-        m_opengl_info_html->SetBorders(10);
-        wxString blacklisted_libraries_message;
-#ifdef WIN32
-        std::wstring blacklisted_libraries = BlacklistedLibraryCheck::get_instance().get_blacklisted_string().c_str();
-        if (! blacklisted_libraries.empty())
-            blacklisted_libraries_message = wxString("<br><b>") + _L("Blacklisted libraries loaded into OrcaSlicer process:") + "</b><br>" + blacklisted_libraries;
-#endif // WIN32
-       const auto text = GUI::format_wxstr(
-            "<html>"
-            "<body bgcolor= %s link= %s>"
-            "<font color=%s>"
-            "%s<br>%s<br>%s<br>%s"
-            "</font>"
-            "</body>"
-            "</html>", bgr_clr_str, text_clr_str, text_clr_str,
-            blacklisted_libraries_message,
-            get_mem_info(true), wxGetApp().get_gl_info(false),
-            "<b>" + _L("SIMD is supported:") + "</b> " + Eigen::SimdInstructionSetsInUse());
-
-        m_opengl_info_html->SetPage(text);
-        main_sizer->Add(m_opengl_info_html, 1, wxEXPAND | wxBOTTOM, 15);
-    }
-
-    wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK);
-    m_btn_copy_to_clipboard = new wxButton(this, wxID_ANY, _L("Copy to Clipboard"), wxDefaultPosition, wxDefaultSize);
-
-    buttons->Insert(0, m_btn_copy_to_clipboard, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 5);
-    m_btn_copy_to_clipboard->Bind(wxEVT_BUTTON, &SysInfoDialog::onCopyToClipboard, this);
-
-    this->SetEscapeId(wxID_OK);
-    this->Bind(wxEVT_BUTTON, &SysInfoDialog::onCloseDialog, this, wxID_OK);
-    main_sizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, 3);
-
-    wxGetApp().UpdateDlgDarkUI(this, true);
-
-//     this->Bind(wxEVT_LEFT_DOWN, &SysInfoDialog::onCloseDialog, this);
-//     logo->Bind(wxEVT_LEFT_DOWN, &SysInfoDialog::onCloseDialog, this);
-
-	SetSizer(main_sizer);
-	main_sizer->SetSizeHints(this);
-}
-
-void SysInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
-{
-    m_logo_bmp.msw_rescale();
-    m_logo->SetBitmap(m_logo_bmp.bmp());
-
-    wxFont font = get_default_font(this);
-    const int fs = font.GetPointSize() - 1;
-    int font_size[] = { static_cast<int>(fs*1.5), static_cast<int>(fs*1.4), static_cast<int>(fs*1.3), fs, fs, fs, fs };
-
-    m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
-    m_html->Refresh();
-
-    const int& em = em_unit();
-
-    msw_buttons_rescale(this, em, { wxID_OK, m_btn_copy_to_clipboard->GetId() });
-
-    m_opengl_info_html->SetMinSize(wxSize(-1, 16 * em));
-    m_opengl_info_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
-    m_opengl_info_html->Refresh();
-
-    const wxSize& size = wxSize(65 * em, 55 * em);
-
-    SetMinSize(size);
-    Fit();
-
-    Refresh();
-}
-
-void SysInfoDialog::onCopyToClipboard(wxEvent &)
-{
-    wxTheClipboard->Open();
-    const auto text = get_main_info(false) + "\n" + wxGetApp().get_gl_info(true);
-    wxTheClipboard->SetData(new wxTextDataObject(text));
-    wxTheClipboard->Close();
-}
-
-void SysInfoDialog::onCloseDialog(wxEvent &)
-{
-    this->EndModal(wxID_CLOSE);
-}
-
-} // namespace GUI
-} // namespace Slic3r
@@ -1,36 +0,0 @@
-#ifndef slic3r_GUI_SysInfoDialog_hpp_
-#define slic3r_GUI_SysInfoDialog_hpp_
-
-#include <wx/event.h>
-#include <wx/wx.h>
-#include <wx/html/htmlwin.h>
-
-#include "GUI_Utils.hpp"
-#include "wxExtensions.hpp"
-
-namespace Slic3r { 
-namespace GUI {
-
-class SysInfoDialog : public DPIDialog
-{
-    ScalableBitmap  m_logo_bmp;
-    wxStaticBitmap* m_logo;
-    wxHtmlWindow*   m_opengl_info_html;
-    wxHtmlWindow*   m_html;
-
-    wxButton*       m_btn_copy_to_clipboard;
-
-public:
-    SysInfoDialog();
-
-protected:
-    void on_dpi_changed(const wxRect &suggested_rect) override;
-    
-private:
-    void onCopyToClipboard(wxEvent &);
-    void onCloseDialog(wxEvent &);
-};
-} // namespace GUI
-} // namespace Slic3r
-
-#endif
@@ -101,7 +101,6 @@ bool AMSinfo::parse_ams_info(MachineObject *obj, DevAms *ams, bool remain_flag,
        Caninfo info;
        // tray is exists
        if (it != ams->GetTrays().end() && it->second->is_exists) {
-            info.is_empty = it->second->is_empty;
            if (it->second->is_tray_info_ready()) {
                info.can_id        = it->second->id;
                info.ctype         = it->second->ctype;
@@ -169,7 +168,6 @@ void AMSinfo::parse_ext_info(MachineObject* obj, DevAmsTray tray) {
    this->ams_type = AMSModel::EXT_AMS;
    Caninfo info;
    info.can_id = std::to_string(0);
-    info.is_empty = tray.is_empty;
    this->cans.clear();

    if (tray.id == std::to_string(VIRTUAL_TRAY_MAIN_ID))
@@ -1132,9 +1130,9 @@ void AMSLib::render_lite_text(wxDC& dc)
    dc.SetTextForeground(temp_text_colour);

    auto libsize = GetSize();
-    if (!m_info.is_empty && (m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND
+    if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND
        || m_info.material_state == AMSCanType::AMS_CAN_TYPE_BRAND
-        || m_info.material_state == AMSCanType::AMS_CAN_TYPE_VIRTUAL)) {
+        || m_info.material_state == AMSCanType::AMS_CAN_TYPE_VIRTUAL) {

        if (m_info.material_name.empty()) {
            auto tsize = dc.GetMultiLineTextExtent("?");
@@ -1182,8 +1180,8 @@ void AMSLib::render_lite_text(wxDC& dc)
        }
    }

-    if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY || m_info.is_empty) {
-        auto tsize = dc.GetMultiLineTextExtent(_L("/"));
+    if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY) {
+        auto tsize = dc.GetMultiLineTextExtent("/");
        auto pot = wxPoint((libsize.x - tsize.x) / 2 + FromDIP(2), (libsize.y - tsize.y) / 2 + FromDIP(3));
        dc.DrawText("/", pot);
    }
@@ -1191,12 +1189,8 @@ void AMSLib::render_lite_text(wxDC& dc)

 void AMSLib::render_generic_text(wxDC &dc)
 {
-    // K/N is Bambu firmware's flow-dynamics calibration; agents with no printer-side
-    // records (OrcaSonar, Moonraker) must not show a synthesized value.
-    const bool k_supported = !m_obj || m_obj->supports_extrusion_cali();
-    const bool show_kn = m_show_kn && k_supported;
-    bool show_k_value = k_supported;
-    if (!k_supported || m_info.material_name.empty()) {
+    bool show_k_value = true;
+    if (m_info.material_name.empty()) {
        show_k_value = false;
    }
    else if (m_info.cali_idx == -1 || (m_obj && (CalibUtils::get_selected_calib_idx(m_obj->pa_calib_tab, m_info.cali_idx) == -1))) {
@@ -1237,9 +1231,9 @@ void AMSLib::render_generic_text(wxDC &dc)
    }

    auto libsize = GetSize();
-    if (!m_info.is_empty && (m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND
+    if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_THIRDBRAND
        || m_info.material_state == AMSCanType::AMS_CAN_TYPE_BRAND
-        || m_info.material_state == AMSCanType::AMS_CAN_TYPE_VIRTUAL)) {
+        || m_info.material_state == AMSCanType::AMS_CAN_TYPE_VIRTUAL) {

        if (m_info.material_name.empty() /*&&  m_info.material_state != AMSCanType::AMS_CAN_TYPE_VIRTUAL*/) {
            auto tsize = dc.GetMultiLineTextExtent("?");
@@ -1277,7 +1271,7 @@ void AMSLib::render_generic_text(wxDC &dc)
                auto line_top_tsize = dc.GetMultiLineTextExtent(line_top);
                auto line_bottom_tsize = dc.GetMultiLineTextExtent(line_bottom);

-                if (!show_kn) {
+                if (!m_show_kn) {
                    auto pot_top = wxPoint((libsize.x - line_top_tsize.x) / 2, (libsize.y - line_top_tsize.y) / 2 - line_top_tsize.y + FromDIP(6));
                    dc.DrawText(line_top, pot_top);

@@ -1308,7 +1302,7 @@ void AMSLib::render_generic_text(wxDC &dc)

        //draw k&n
        if (m_obj && show_k_value) {
-            if (show_kn) {
+            if (m_show_kn) {
                wxString str_k = wxString::Format("K %1.3f", m_info.k);
                wxString str_n = wxString::Format("N %1.3f", m_info.n);
                dc.SetFont(::Label::Body_11);
@@ -1319,7 +1313,7 @@ void AMSLib::render_generic_text(wxDC &dc)
        }
    }

-    if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY || m_info.is_empty) {
+    if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY) {
        auto tsize = dc.GetMultiLineTextExtent(_L("Empty"));
        auto pot = wxPoint((libsize.x - tsize.x) / 2, (libsize.y - tsize.y) / 2 + FromDIP(3));
        dc.DrawText(_L("Empty"), pot);
@@ -2816,7 +2810,7 @@ void AMSPreview::doRender(wxDC &dc)
                }
                else {
                    wxRect rect(left, (size.y - AMS_ITEM_CUBE_SIZE.y) / 2, AMS_ITEM_CUBE_SIZE.x, AMS_ITEM_CUBE_SIZE.y);
-                    if (iter->material_state == AMSCanType::AMS_CAN_TYPE_EMPTY || iter->is_empty) {
+                    if (iter->material_state == AMSCanType::AMS_CAN_TYPE_EMPTY) {
                        dc.SetPen(wxPen(wxColor(0, 0, 0)));
                        dc.DrawLine(rect.GetRight() - FromDIP(1), rect.GetTop() + FromDIP(1), rect.GetLeft() + FromDIP(1), rect.GetBottom() - FromDIP(1));
                    }
@@ -200,7 +200,6 @@ struct Caninfo
    wxString        material_name;
    wxColour        material_colour = {*wxWHITE};
    AMSCanType      material_state;
-    bool            is_empty = false;
    int             ctype=0;
    int             material_remain = 100;
    int             cali_idx = -1;
@@ -216,7 +215,6 @@ public:
            material_name == other.material_name &&
            material_colour == other.material_colour &&
            material_state == other.material_state &&
-            is_empty == other.is_empty &&
            ctype == other.ctype &&
            material_remain == other.material_remain &&
            cali_idx == other.cali_idx &&
@@ -1,15 +0,0 @@
-#ifndef slic3r_wxinit_hpp_
-#define slic3r_wxinit_hpp_
-
-#include <wx/wx.h>
-#include <wx/intl.h>
-#include <wx/html/htmlwin.h>
-
-// Perl redefines a _ macro, so we undef this one
-#undef _
-
-// We do want to use translation however, so define it as __ so we can do a find/replace
-// later when we no longer need to undef _
-#define __(s)                     wxGetTranslation((s))
-
-#endif
@@ -31,23 +31,8 @@
 #include <curl/curl.h>
 #include <utility>

-#include <openssl/err.h>
-#include <openssl/ssl.h>
+#ifdef OPENSSL_CERT_OVERRIDE
 #include <openssl/x509.h>
-#include <openssl/x509err.h>
-
-#ifdef __APPLE__
-#    include <unistd.h>
-#endif
-
-#ifdef _WIN32
-#    ifndef NOMINMAX
-#        define NOMINMAX
-#    endif
-#    include <windows.h>
-#    include <wincrypt.h>
-// wincrypt.h uses this token for a certificate-name property identifier.
-#    undef X509_NAME
 #endif

 namespace fs = boost::filesystem;
@@ -970,50 +955,6 @@ std::string Http::tls_system_cert_store()
    return {};
 }

-void Http::add_platform_root_certificates(SSL_CTX* ssl_context)
-{
-#ifdef _WIN32
-    X509_STORE* openssl_store = SSL_CTX_get_cert_store(ssl_context);
-    if (!openssl_store)
-        throw std::runtime_error("unable to get OpenSSL certificate store");
-
-    const auto load_store = [&](DWORD location) {
-        HCERTSTORE windows_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0,
-                                                 location | CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG,
-                                                 L"ROOT");
-        if (!windows_store)
-            return;
-
-        PCCERT_CONTEXT windows_certificate = nullptr;
-        while ((windows_certificate = CertEnumCertificatesInStore(windows_store, windows_certificate)) != nullptr) {
-            const unsigned char* encoded = windows_certificate->pbCertEncoded;
-            X509* certificate = d2i_X509(nullptr, &encoded, static_cast<long>(windows_certificate->cbCertEncoded));
-            if (!certificate) {
-                ERR_clear_error();
-                continue;
-            }
-
-            ERR_clear_error();
-            if (X509_STORE_add_cert(openssl_store, certificate) != 1)
-                ERR_clear_error();
-            X509_free(certificate);
-        }
-
-        CertCloseStore(windows_store, 0);
-    };
-
-    load_store(CERT_SYSTEM_STORE_CURRENT_USER);
-    load_store(CERT_SYSTEM_STORE_LOCAL_MACHINE);
-#elif defined(__APPLE__)
-    // macOS ships its system trust roots as a PEM bundle; the bundled OpenSSL's
-    // compiled-in default path is the build directory, so load this explicitly.
-    if (ssl_context && ::access("/etc/ssl/cert.pem", R_OK) == 0)
-        SSL_CTX_load_verify_locations(ssl_context, "/etc/ssl/cert.pem", nullptr);
-#else
-    (void)ssl_context;
-#endif
-}
-
 std::string Http::url_encode(const std::string &str)
 {
 	::CURL *curl = ::curl_easy_init();
@@ -13,8 +13,6 @@
 #include "libslic3r/Exception.hpp"
 #include "libslic3r_version.h"

-typedef struct ssl_ctx_st SSL_CTX;
-
 #define MAX_SIZE_TO_FILE    3*1024

 namespace Slic3r {
@@ -202,10 +200,6 @@ public:
    // Return empty string on success or error message on fail.
    static std::string tls_global_init();
    static std::string tls_system_cert_store();
-    // Add platform root certificates to a standalone OpenSSL context. This
-    // supplements set_default_verify_paths() on platforms where OpenSSL does
-    // not use the native certificate store.
-    static void add_platform_root_certificates(SSL_CTX* ssl_context);

 	// converts the given string to an url_encoded_string
 	static std::string url_encode(const std::string &str);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ExPikaPaka	18d891f7c7	Merge remote-tracking branch 'origin/main' into feature/texdisp-model-uv # Conflicts: # src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp	2026-10-12 15:15:34 +02:00
ExPikaPaka	d2fff6dec9	Take the tile-size row through the typed slider's tooltip argument The typed-slider branch merged, so float_row() now carries each row's tooltip itself and shows it for a disabled slider as well. The ModelUV row hands it the two texts instead of drawing its own hover.	2026-10-12 15:14:50 +02:00
SoftFever	7149728219	Fix clang-cl dependency builds failing on a precompiled header from the compiler cache	2026-10-12 20:27:37 +08:00
ExPikaPaka	496b16dabb	Keep the model-UV work off the lines its neighbours change Three small moves, no behaviour change: - the two 'case ModelUV:' labels are dropped. They fell through to Triplanar, which is what 'default:' already does, and they sat one line under the return statement the UV-orientation branch rewrites. - transfer_facet_paint() moves to its own place in the file, away from transfer_uv_channel(), so the branch that carries paint across a bake can hold the same function verbatim. - the UV channel is put back after the layer masks are reset rather than before, which keeps it clear of the paint transfer above it. The comment over the colour merge is also corrected: the carried paint is what it now merges over.	2026-10-12 14:11:15 +02:00
SoftFever	f49d49b5a6	Texture displacement: typed values on every panel slider (#16395 ) Every slider in the texture displacement panel can now be given an exact number, either by Ctrl+clicking the track or via a small edit icon at its right end. Both routes reuse ImGui's own temp-input mode. Each slider also gets a tooltip with its description and its range, and the panel's `?` popup lists both ways in. Draft: description to be refined.	2026-10-12 20:03:43 +08:00
SoftFever	08f2037cbd	Texture displacement: save layers, textures and paint in the .3mf (#16148 ) ## General Nothing about texture displacement was written to the `.3mf`, so a painted relief did not survive closing the project. Everything the user set up is saved now, so a project reopens with the relief intact and still editable. ### What is saved - The layer stack: every per-layer setting (depth, midlevel, smoothing, tiling, projection blend mode, colour) and the per-volume options - Each layer's texture, as a file in the archive (why? because user might want to move .3mf to another computer where custom textures are missing, or he saves .3mf then deletes textures, and returns back to .3mf) - The painted region, one mask per layer slot - The UV work: LSCM seams, island placement, per-vertex overrides - Editor state: the selected layer and Standard/Pro, so the panel reopens where it was left ### What is not saved - The preview mesh. It is a second copy of the model in the file, for something the app rebuilds quickly on reopen. - Panel docked/undocked, which goes to the application config instead ## Format - `<volume id>.json` - the layer stack and the per-volume options - `<volume id>_<slot>.png` - each layer's texture, referenced from the JSON through `path_in_3mf` Paint masks ride along as one per-triangle attribute per slot (`paint_texture_0..7`), beside the attributes the existing paint tools already write. ## Compatibility Both ways: - an older build ignores what it does not know and still opens the project, losing only the relief - a newer build finds nothing in an older project and leaves the volume as today.	2026-10-12 20:00:17 +08:00
SoftFever	d8cae3268a	Merge branch 'main' into feature/texdisp-3mf-persistence	2026-10-12 19:47:05 +08:00
HanifKoh	cccf53850e	Remove Never-Built and Stub Source Files (#16361 ) SysInfoDialog, JumpPointSearch and WebUpdatePlugin are in no CMake list on any platform, and nothing includes ConfigExceptions.hpp, wxinit.h or Utils/Profile.hpp. MultiTaskModel holds only empty namespaces. Also drop the empty GUI_App::system_info() and comments that still mention SysInfoDialog.	2026-10-12 18:53:32 +08:00
HanifKoh	5095733323	Fix Include Guards Copied From Other Headers (#16368 ) TriangleMeshDeal.hpp reused Timer.hpp's guard and CloneDialog.hpp reused SingleChoiceDialog.hpp's, so including both headers of a pair silently dropped the second one. Use #pragma once instead.	2026-10-12 18:52:53 +08:00
SoftFever	3f78959a0c	Harden loading and saving of texture displacement in projects A project no longer reads texture files from outside its archive, and a malformed value or layer slot drops only the texture layers instead of failing the whole load. Copies of an object that share a mesh keep their own texture paint when saved, and projects without texture paint no longer use extra memory to load.	2026-10-12 17:47:04 +08:00
SoftFever	30e48183e3	Merge branch 'main' into feature/texdisp-3mf-persistence # Conflicts: # src/libslic3r/TextureDisplacement.hpp # tests/libslic3r/test_texture_displacement.cpp	2026-10-12 16:58:03 +08:00
ExPikaPaka	c113b46594	Include cstdint and Point.hpp where the new code uses uint8_t and Vec2f The clang-tidy job checks include-what-you-use on changed lines, and the three files it named relied on a transitive include for a symbol the new code introduced.	2026-10-12 09:44:26 +02:00
ExPikaPaka	18cef4f51d	Texture a model through its own UV channel, and keep its colours through a bake Importing a model that already carries colours was broken for texture displacement in two ways: the UV layout it was authored against was thrown away and re-unwrapped, and a bake overwrote the colours it arrived with. A model's own UV channel is now kept. ModelVolume::texture_uv holds three uvs per triangle, in the mesh's own triangle order and with V flipped to the convention DecodedHeightTexture samples in. It is filled from a textured OBJ's vt data on import and carried across every stage that replaces the mesh - the colour import's painted mesh, the gizmo's remesh and subdivide, the default pipeline's rebuild - by transfer_uv_channel(), which gives each new corner the uv of its closest point on the surface it came from. A new mapping, TextureProjectionMethod::ModelUV, samples that channel instead of solving an unwrap, and a new layer on a volume that has one starts there. Its uv is already normalized, so it keeps the layer's rotation and offset but not the millimetre tile size (the slider is disabled) or the non-square aspect correction; with no channel it falls back to Triplanar, as LSCM does when a patch will not flatten. A bake with colour off on every layer now leaves the model's colours where they were. The default pipeline rebuilds the topology, which left mmu_segmentation_facets describing a triangle set that no longer existed. ModelVolume::restore_painting() cannot carry it: its remap wants a target triangle overlapping the source paint to within 0.01 mm, and a baked surface has moved by the relief depth. transfer_facet_paint() gives each new facet the state at its own foot point on the pre-bake surface instead, and the bake commit runs it over all four paint channels. The classic path is untouched, since there triangle i is still triangle i. Blend gains an Override entry next to Add: the layer replaces the displacement under it rather than combining with it, which is what the stack's colour already does where two layers overlap. The combo's order is the panel's, not the enum's, so stored blend modes are unaffected. Measured on a textured OBJ of 85224 triangles (uv_color_probe in the bake harness): the channel survives import intact, the relief follows the model's own uv on 98.7% of vertices against 51.3% for a re-unwrap, and a colour-off bake through the default pipeline keeps the colours on 99.8% of the baked surface where it previously kept none. Through a coloured 3mf, 100%.	2026-10-12 07:57:15 +02:00
ExPikaPaka	ed1f3e52c9	Texture displacement: typed values on every panel slider Every slider in the texture displacement panel now takes an exact number, either by Ctrl+clicking the track or through a small edit icon at its right end. Both routes end in ImGui's own temp-input mode: the icon only asks ImGui to focus the slider, which is what turns it into an input box, so the parsing, the clamping and the Enter/click-away behaviour stay ImGui's rather than becoming a second implementation. The mechanism lives in one helper, typed_row(), with a float and an int form over it. float_row() and int_row() are thin wrappers on those, and the six sliders that previously built their widget inline (brush size, smart fill angle, edge fade amount, remesh sharp angle, refine resolution and the uniform triangle budget) now go through the same path. Each slider carries a tooltip with its description and its range. The range is derived from the bounds and the format string the slider is already given, so no row states them twice and the tooltip cannot drift from the track. The tooltip allows hovering while disabled, since several rows are drawn inside disabled_begin(), where a greyed slider is exactly when the explanation is wanted. The panel's "?" popup gains an entry for each of the two ways in, appended to every tool's shortcut list and shown on their own when no painting tool is selected, where that popup was previously empty.	2026-10-12 07:57:07 +02:00
ExPikaPaka	8ecfee6a21	Save where the panel was left, and recover a texture the archive lacks The project carried the layer stack but not the user's place in it: a reopened project landed on slot 0 in Standard, whatever they had been editing. The active layer and Standard/Pro now live on the volume, next to the rest of its options, and come back with it. Docked/undocked goes to the application config instead - it describes the user's window, not the model, so opening someone else's project must not move their panel. A layer whose image_data was empty at save time was written with no texture and came back with none. It now falls back to the file the layer came from, which the importer put in the user's own texture library, so a project reopened on the same machine keeps its pixels. The texture is always stored as .png: the importer converts whatever the user picked, so the extension was being taken from a name that no longer described the bytes. Also adds v2_flip_edges to the cereal field list, which the undo stack was silently dropping.	2026-10-09 09:35:35 +02:00
ExPikaPaka	fbf4652e12	Fix the build and clang-tidy failures in the persistence change The round-trip test named a TextureTileMethod enumerator that does not exist (MirroredRepeat, not Mirror) and used a bare Approx, which Catch2 v3 keeps in its own namespace. The rest of the file compares floats with WithinAbs, so these follow it rather than reaching for Catch::Approx. bbs_3mf.cpp reads and writes the layer JSON but picked up the declarations through another header, and the same for boost::to_lower.	2026-10-09 09:05:42 +02:00
ExPikaPaka	be9ff50130	Merge remote-tracking branch 'origin/main' into feature/texdisp-3mf-persistence # Conflicts: # src/libslic3r/TextureDisplacement.cpp	2026-10-09 09:03:51 +02:00
SoftFever	dee1f1715f	Merge branch 'main' into feature/texdisp-3mf-persistence	2026-10-09 12:15:16 +08:00
ExPikaPaka	fcb1f62bd9	Save texture displacement in the project file A painted relief did not survive closing the project: nothing about the feature was written to the .3mf, so the layers, their textures and the paint mask were all lost on save. The layer struct's cereal save()/load() serve the undo/redo stack only, which is one session and one binary stream. Write the layer stack and the per-volume options as JSON in the archive, and each layer's texture as the image file it was loaded from, both referenced by path - the same split EmbossShape already makes for its SVG. The image stays out of the XML deliberately: it is binary and routinely megabytes, and base64 in an attribute would bloat the one file every reader parses just to list the objects. JSON rather than the cereal stream next to it because that one is positional and unversioned, which would make every future field a project-breaking change; an unknown key is ignored and a missing one keeps its default, so a project written by either side keeps loading. The paint masks go in as one attribute per layer slot, mirroring paint_color. Older readers ignore attributes they do not know, so a project written here still opens in a build without the feature - it loses the relief, which is all it could have done with it anyway. The layers are restored while the volume is being built rather than after the archive is walked: volumes are constructed only once the whole archive has been read, so a hook placed after the walk ran before any volume existed and restored nothing.	2026-10-05 08:36:22 +02:00
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M2.5,2.5h11v11h-11z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M8,2.5v11M2.5,8h11" style="fill:none;stroke:#949494;stroke-dasharray:1.5,1.5"/><path d="M4.5,11.5l3.5-6l3.5,6z" style="fill:#009688"/></svg>`