Merge branch 'master-remote' into feature/merge_remote_1.3

# Conflicts: # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/Voron.json # resources/profiles/Voron/filament/Voron Generic ABS.json # resources/profiles/Voron/filament/Voron Generic ASA.json # resources/profiles/Voron/filament/Voron Generic PA-CF.json # resources/profiles/Voron/filament/Voron Generic PA.json # resources/profiles/Voron/filament/Voron Generic PC.json # resources/profiles/Voron/filament/Voron Generic PETG.json # resources/profiles/Voron/filament/Voron Generic PLA-CF.json # resources/profiles/Voron/filament/Voron Generic PLA.json # resources/profiles/Voron/filament/Voron Generic PVA.json # resources/profiles/Voron/filament/Voron Generic TPU.json # resources/profiles/Voron/filament/fdm_filament_abs.json # resources/profiles/Voron/filament/fdm_filament_asa.json # resources/profiles/Voron/filament/fdm_filament_common.json # resources/profiles/Voron/filament/fdm_filament_pa.json # resources/profiles/Voron/filament/fdm_filament_pc.json # resources/profiles/Voron/filament/fdm_filament_pet.json # resources/profiles/Voron/filament/fdm_filament_pla.json # resources/profiles/Voron/filament/fdm_filament_pva.json # resources/profiles/Voron/filament/fdm_filament_tpu.json # resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json # resources/profiles/Voron/machine/Voron 0.1.json # resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json # resources/profiles/Voron/machine/Voron 2.4 250.json # resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json # resources/profiles/Voron/machine/Voron 2.4 300.json # resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json # resources/profiles/Voron/machine/Voron 2.4 350.json # resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json # resources/profiles/Voron/machine/Voron Trident 250.json # resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json # resources/profiles/Voron/machine/Voron Trident 300.json # resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json # resources/profiles/Voron/machine/Voron Trident 350.json # resources/profiles/Voron/machine/fdm_klipper_common.json # resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json # resources/profiles/Voron/process/0.12mm Fine @Voron.json # resources/profiles/Voron/process/0.15mm Optimal @Voron.json # resources/profiles/Voron/process/0.20mm Standard @Voron.json # resources/profiles/Voron/process/0.24mm Draft @Voron.json # resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json # resources/profiles/Voron/process/fdm_process_voron_common.json # src/libslic3r/Preset.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/PrintObject.cpp # src/slic3r/GUI/BackgroundSlicingProcess.cpp # src/slic3r/GUI/Field.cpp # src/slic3r/GUI/GLToolbar.cpp # src/slic3r/GUI/GLToolbar.hpp # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/MainFrame.hpp # src/slic3r/GUI/NotificationManager.cpp # src/slic3r/GUI/PhysicalPrinterDialog.cpp # src/slic3r/GUI/PhysicalPrinterDialog.hpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/Plater.hpp # src/slic3r/GUI/PrintHostDialogs.cpp # src/slic3r/GUI/PrintHostDialogs.hpp # src/slic3r/Utils/PrintHost.cpp
2025-10-19 14:51:11 -06:00 · 2022-10-20 23:12:00 +08:00 · 2022-10-20 23:12:00 +08:00 · 35455e6533
commit 35455e6533
parent 293f2af0dc c24680e09d
278 changed files with 14888 additions and 2414 deletions
--- a/resources/profiles/Voron/process/0.08mm
+++ b/resources/profiles/Voron/process/0.08mm
@ -1,6 +1,6 @@
 {
    "type": "process",
-    "setting_id": "GP001",
+    "setting_id": "GP_VORON_001",
    "name": "0.08mm Extra Fine @Voron",
    "from": "system",
    "instantiation": "true",
@ -8,4 +8,4 @@
    "layer_height": "0.08",
    "bottom_shell_layers": "7",
    "top_shell_layers": "9"
-}
+}
--- a/resources/profiles/Voron/process/0.12mm
+++ b/resources/profiles/Voron/process/0.12mm
@ -1,6 +1,6 @@
 {
    "type": "process",
-    "setting_id": "GP002",
+    "setting_id": "GP_VORON_002",
    "name": "0.12mm Fine @Voron",
    "from": "system",
    "instantiation": "true",
--- a/resources/profiles/Voron/process/0.15mm
+++ b/resources/profiles/Voron/process/0.15mm
@ -1,6 +1,6 @@
 {
    "type": "process",
-    "setting_id": "GP003",
+    "setting_id": "GP_VORON_003",
    "name": "0.15mm Optimal @Voron",
    "from": "system",
    "instantiation": "true",
--- a/resources/profiles/Voron/process/0.20mm
+++ b/resources/profiles/Voron/process/0.20mm
@ -1,6 +1,6 @@
 {
    "type": "process",
-    "setting_id": "GP004",
+    "setting_id": "GP_VORON_004",
    "name": "0.20mm Standard @Voron",
    "from": "system",
    "inherits": "fdm_process_voron_common",
--- a/resources/profiles/Voron/process/0.24mm
+++ b/resources/profiles/Voron/process/0.24mm
@ -1,6 +1,6 @@
 {
    "type": "process",
-    "setting_id": "GP005",
+    "setting_id": "GP_VORON_005",
    "name": "0.24mm Draft @Voron",
    "from": "system",
    "instantiation": "true",
--- a/resources/profiles/Voron/process/0.28mm
+++ b/resources/profiles/Voron/process/0.28mm
@ -1,6 +1,6 @@
 {
    "type": "process",
-    "setting_id": "GP006",
+    "setting_id": "GP_VORON_006",
    "name": "0.28mm Extra Draft @Voron",
    "from": "system",
    "instantiation": "true",