Merge remote-tracking branch 'BS/v1.7.2'

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> # Conflicts: # .github/ISSUE_TEMPLATE/bug_report.md # .github/workflows/build_ubuntu.yml # .gitignore # Containerfile # Dockerfile # README.md # deps/Boost/Boost.cmake # deps/OpenEXR/OpenEXR.cmake # deps/OpenVDB/OpenVDB.cmake # doc/How to build - Mac OS.md # localization/i18n/OrcaSlicer.pot # localization/i18n/de/OrcaSlicer_de.po # localization/i18n/en/OrcaSlicer_en.po # localization/i18n/es/OrcaSlicer_es.po # localization/i18n/fr/OrcaSlicer_fr.po # localization/i18n/hu/OrcaSlicer_hu.po # localization/i18n/it/OrcaSlicer_it.po # localization/i18n/ja/OrcaSlicer_ja.po # localization/i18n/list.txt # localization/i18n/nl/OrcaSlicer_nl.po # localization/i18n/sv/OrcaSlicer_sv.po # localization/i18n/zh_cn/OrcaSlicer_zh_CN.po # resources/i18n/de/BambuStudio.mo # resources/i18n/en/BambuStudio.mo # resources/i18n/es/BambuStudio.mo # resources/i18n/fr/BambuStudio.mo # resources/i18n/hu/BambuStudio.mo # resources/i18n/it/BambuStudio.mo # resources/i18n/ja/BambuStudio.mo # resources/i18n/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/images/im_all_plates_stats.svg # resources/profiles/Anker.json # resources/profiles/Anker/filament/Generic ASA @Anker.json # resources/profiles/Anker/filament/Generic PA @Anker.json # resources/profiles/Anker/filament/Generic PA-CF @Anker.json # resources/profiles/Anker/filament/Generic PC @Anker.json # resources/profiles/Anker/filament/Generic PETG @Anker.json # resources/profiles/Anker/filament/Generic PLA-CF @Anker.json # resources/profiles/Anker/filament/Generic PVA @Anker.json # resources/profiles/Anker/filament/Generic TPU @Anker.json # resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json # resources/profiles/Anker/machine/Anker M5.json # resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json # resources/profiles/Anker/machine/Anker M5C.json # resources/profiles/Anker/machine/fdm_machine_common.json # resources/profiles/Anker/process/0.05mm Ultradetail @Anker.json # resources/profiles/Anker/process/0.15mm Fast @Anker.json # resources/profiles/Anker/process/0.20mm Fast @Anker.json # resources/profiles/Anker/process/0.20mm Standard @Anker.json # resources/profiles/Anker/process/0.25mm Fast @Anker.json # resources/profiles/Anker/process/fdm_process_common.json # resources/profiles/Anycubic.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json # resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic Chiron.json # resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic Kobra Max.json # resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic Vyper.json # resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json # resources/profiles/Anycubic/machine/fdm_machine_common.json # resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic 4MaxPro2.json # resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Chiron.json # resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Kobra2.json # resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic KobraMax.json # resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Vyper.json # resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic i3MegaS.json # resources/profiles/Anycubic/process/0.20mm Standard @Anycubic 4MaxPro.json # resources/profiles/Anycubic/process/0.20mm Standard @Anycubic 4MaxPro2.json # resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Chiron.json # resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra2.json # resources/profiles/Anycubic/process/0.20mm Standard @Anycubic KobraMax.json # resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Vyper.json # resources/profiles/Anycubic/process/0.20mm Standard @Anycubic i3MegaS.json # resources/profiles/Anycubic/process/0.30mm Draft @Anycubic 4MaxPro2.json # resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Chiron.json # resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Kobra2.json # resources/profiles/Anycubic/process/0.30mm Draft @Anycubic KobraMax.json # resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Vyper.json # resources/profiles/Anycubic/process/0.30mm Draft @Anycubic i3MegaS.json # resources/profiles/Anycubic/process/fdm_process_common.json # resources/profiles/BBL.json # resources/profiles/BBL/process/fdm_process_bbl_common.json # resources/profiles/Creality.json # resources/profiles/Creality/filament/fdm_filament_abs.json # resources/profiles/Creality/filament/fdm_filament_pla.json # resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json # resources/profiles/Creality/machine/Creality CR-10 Max.json # resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json # resources/profiles/Creality/machine/Creality CR-10 V2.json # resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json # resources/profiles/Creality/machine/Creality Ender-3 S1.json # resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-3 V2.json # resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5 Plus.json # resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5 S1.json # resources/profiles/Creality/machine/Creality Ender-5.json # resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5S.json # resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-6.json # resources/profiles/Creality/machine/fdm_creality_common.json # resources/profiles/Creality/machine/fdm_machine_common.json # resources/profiles/Creality/process/0.12mm Fine @Creality CR10Max.json # resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V2.json # resources/profiles/Creality/process/0.15mm Optimal @Creality CR10Max.json # resources/profiles/Creality/process/0.15mm Optimal @Creality Ender3V2.json # resources/profiles/Creality/process/0.16mm Optimal @Creality CR10V2.json # resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3S1.json # resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3S1Pro.json # resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5.json # resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Plus.json # resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5S.json # resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5S1.json # resources/profiles/Creality/process/0.16mm Optimal @Creality Ender6.json # resources/profiles/Creality/process/0.20mm Standard @Creality CR10Max.json # resources/profiles/Creality/process/0.20mm Standard @Creality CR10V2.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender3S1.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender3S1Pro.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V2.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender5.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Plus.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender5S.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender5S1.json # resources/profiles/Creality/process/0.20mm Standard @Creality Ender6.json # resources/profiles/Creality/process/0.24mm Draft @Creality CR10Max.json # resources/profiles/Creality/process/0.24mm Draft @Creality Ender3V2.json # resources/profiles/Creality/process/0.24mm Draft @Creality.json # resources/profiles/Creality/process/fdm_process_creality_common.json # resources/profiles/Custom/filament/My Generic PETG.json # resources/profiles/Custom/filament/My Generic PLA.json # resources/profiles/Elegoo.json # resources/profiles/Elegoo/filament/fdm_filament_common.json # resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2D.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2S.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3.json # resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune X.json # resources/profiles/Elegoo/machine/Elegoo Neptune.json # resources/profiles/Elegoo/machine/fdm_machine_common.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune2.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune2D.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune2S.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3Max.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3Plus.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3Pro.json # resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo NeptuneX.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune2.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune2D.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune2S.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3Max.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3Plus.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3Pro.json # resources/profiles/Elegoo/process/0.12mm Fine @Elegoo NeptuneX.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune2.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune2D.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune2S.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3Max.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3Plus.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3Pro.json # resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo NeptuneX.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune2.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune2D.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune2S.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3Max.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3Plus.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3Pro.json # resources/profiles/Elegoo/process/0.20mm Standard @Elegoo NeptuneX.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune2.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune2D.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune2S.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3Max.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3Plus.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3Pro.json # resources/profiles/Elegoo/process/0.24mm Draft @Elegoo NeptuneX.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune2.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune2D.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune2S.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3Max.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3Plus.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3Pro.json # resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo NeptuneX.json # resources/profiles/Prusa.json # resources/profiles/Prusa/filament/fdm_filament_common.json # resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json # resources/profiles/Prusa/machine/Prusa MINI.json # resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json # resources/profiles/Prusa/machine/Prusa MK3S.json # resources/profiles/Prusa/machine/fdm_machine_common.json # resources/profiles/Prusa/process/0.20mm Standard @MINI.json # resources/profiles/Prusa/process/0.20mm Standard @MK3S.json # resources/profiles/Qidi.json # resources/profiles/Qidi/filament/fdm_filament_abs.json # resources/profiles/Qidi/filament/fdm_filament_asa.json # resources/profiles/Qidi/filament/fdm_filament_common.json # resources/profiles/Qidi/filament/fdm_filament_pa.json # resources/profiles/Qidi/filament/fdm_filament_pc.json # resources/profiles/Qidi/filament/fdm_filament_pet.json # resources/profiles/Qidi/filament/fdm_filament_pla.json # resources/profiles/Qidi/filament/fdm_filament_pva.json # resources/profiles/Qidi/filament/fdm_filament_tpu.json # resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-CF Pro.json # resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Max 3.json # resources/profiles/Qidi/machine/Qidi X-Max.json # resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Plus 3.json # resources/profiles/Qidi/machine/Qidi X-Plus.json # resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Smart 3.json # resources/profiles/Qidi/machine/fdm_machine_common.json # resources/profiles/Qidi/machine/fdm_qidi_common.json # resources/profiles/Qidi/machine/fdm_qidi_x3_common.json # resources/profiles/Qidi/process/0.12mm Fine @Qidi XCFPro.json # resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax.json # resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax3.json # resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus.json # resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus3.json # resources/profiles/Qidi/process/0.12mm Fine @Qidi XSmart3.json # resources/profiles/Qidi/process/0.16mm Optimal @Qidi XCFPro.json # resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax.json # resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax3.json # resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus.json # resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus3.json # resources/profiles/Qidi/process/0.16mm Optimal @Qidi XSmart3.json # resources/profiles/Qidi/process/0.20mm Standard @Qidi XCFPro.json # resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax.json # resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax3.json # resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus.json # resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus3.json # resources/profiles/Qidi/process/0.20mm Standard @Qidi XSmart3.json # resources/profiles/Qidi/process/0.25mm Draft @Qidi XCFPro.json # resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax.json # resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax3.json # resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus.json # resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus3.json # resources/profiles/Qidi/process/0.25mm Draft @Qidi XSmart3.json # resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XCFPro.json # resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax.json # resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax3.json # resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus.json # resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus3.json # resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XSmart3.json # resources/profiles/Qidi/process/fdm_process_common.json # resources/profiles/Qidi/process/fdm_process_qidi_common.json # resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json # resources/profiles/Tronxy/filament/Tronxy Generic ABS.json # resources/profiles/Tronxy/process/0.12mm Fine @Tronxy.json # resources/profiles/Tronxy/process/0.15mm Optimal @Tronxy.json # resources/profiles/Tronxy/process/0.20mm Standard @Tronxy.json # resources/profiles/Tronxy/process/0.24mm Draft @Tronxy.json # resources/profiles/Voron.json # resources/profiles/Voron/filament/Generic ABS @Voron.json # resources/profiles/Voron/filament/Generic ASA @Voron.json # resources/profiles/Voron/filament/Generic PA @Voron.json # resources/profiles/Voron/filament/Generic PETG @Voron.json # resources/profiles/Voron/filament/Generic PVA @Voron.json # resources/profiles/Voron/filament/Voron Generic PA-CF.json # resources/profiles/Voron/filament/Voron Generic PC.json # resources/profiles/Voron/filament/Voron Generic PLA-CF.json # resources/profiles/Voron/filament/Voron Generic PLA.json # resources/profiles/Voron/filament/Voron Generic TPU.json # resources/profiles/Voron/machine/Voron 0.1.json # resources/profiles/Voron/machine/Voron 2.4 250.json # resources/profiles/Voron/machine/Voron 2.4 300.json # resources/profiles/Voron/machine/Voron 2.4 350.json # resources/profiles/Voron/machine/Voron Trident 250.json # resources/profiles/Voron/machine/Voron Trident 300.json # resources/profiles/Voron/machine/Voron Trident 350.json # resources/profiles/Voron/process/fdm_process_voron_common.json # resources/profiles/Voxelab.json # resources/profiles/Voxelab/filament/Generic ABS @Voxelab.json # resources/profiles/Voxelab/filament/Generic PLA @Voxelab.json # resources/profiles/Voxelab/filament/fdm_filament_common.json # resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json # resources/profiles/Voxelab/machine/Voxelab Aquila X2.json # resources/profiles/Voxelab/machine/fdm_machine_common.json # resources/profiles/Voxelab/process/0.16mm Optimal @Voxelab AquilaX2.json # resources/profiles/Voxelab/process/0.20mm Standard @Voxelab AquilaX2.json # resources/web/data/text.js # resources/web/guide/21/21.js # resources/web/guide/24/24.js # src/BaseException.cpp # src/OrcaSlicer.cpp # src/libslic3r/AppConfig.cpp # src/libslic3r/BoundingBox.hpp # src/libslic3r/Extruder.hpp # src/libslic3r/Fill/Fill.cpp # src/libslic3r/Format/bbs_3mf.cpp # src/libslic3r/GCode.cpp # src/libslic3r/GCode.hpp # src/libslic3r/GCode/CoolingBuffer.cpp # src/libslic3r/GCode/GCodeProcessor.cpp # src/libslic3r/GCode/GCodeProcessor.hpp # src/libslic3r/GCode/WipeTower.cpp # src/libslic3r/GCodeWriter.cpp # src/libslic3r/GCodeWriter.hpp # src/libslic3r/Model.cpp # src/libslic3r/PerimeterGenerator.cpp # src/libslic3r/Preset.cpp # src/libslic3r/Preset.hpp # src/libslic3r/PresetBundle.cpp # src/libslic3r/PresetBundle.hpp # src/libslic3r/Print.cpp # src/libslic3r/Print.hpp # src/libslic3r/PrintBase.hpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/PrintObject.cpp # src/libslic3r/TreeSupport.cpp # src/libslic3r/Utils.hpp # src/mcut/CMakeLists.txt # src/slic3r/CMakeLists.txt # src/slic3r/GUI/3DBed.cpp # src/slic3r/GUI/AMSMaterialsSetting.cpp # src/slic3r/GUI/AMSMaterialsSetting.hpp # src/slic3r/GUI/BBLTopbar.cpp # src/slic3r/GUI/BBLTopbar.hpp # src/slic3r/GUI/BackgroundSlicingProcess.hpp # src/slic3r/GUI/BindDialog.cpp # src/slic3r/GUI/ConfigManipulation.cpp # src/slic3r/GUI/DeviceManager.cpp # src/slic3r/GUI/Field.cpp # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/GUI_App.hpp # src/slic3r/GUI/GUI_Factories.cpp # src/slic3r/GUI/GUI_Factories.hpp # src/slic3r/GUI/GUI_ObjectList.cpp # src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp # src/slic3r/GUI/Jobs/ArrangeJob.cpp # src/slic3r/GUI/Jobs/FillBedJob.cpp # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/MediaPlayCtrl.cpp # src/slic3r/GUI/Monitor.cpp # src/slic3r/GUI/PartPlate.cpp # src/slic3r/GUI/PartPlate.hpp # src/slic3r/GUI/PlateSettingsDialog.cpp # src/slic3r/GUI/PlateSettingsDialog.hpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/Plater.hpp # src/slic3r/GUI/PresetComboBoxes.cpp # src/slic3r/GUI/ReleaseNote.cpp # src/slic3r/GUI/SelectMachine.cpp # src/slic3r/GUI/StatusPanel.cpp # src/slic3r/GUI/Tab.cpp # src/slic3r/GUI/Widgets/Label.cpp # src/slic3r/GUI/Widgets/Label.hpp # src/slic3r/GUI/Widgets/SideButton.cpp # src/slic3r/GUI/calib_dlg.cpp # src/slic3r/GUI/calib_dlg.hpp # src/slic3r/GUI/wxExtensions.hpp # src/slic3r/Utils/NetworkAgent.cpp # src/slic3r/Utils/bambu_networking.hpp # version.inc
2023-08-26 16:13:57 +08:00 · 2023-08-26 16:13:57 +08:00 · e65b11a831
commit e65b11a831
parent f7184c868b 2f9434a805
734 changed files with 72573 additions and 47919 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,29 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**3mf File for This Bug**
-If it is related to slicing, please append the 3mf file. It could be extremely helpful to solve the issue.
-
-**To Reproduce**
-Steps to reproduce the behavior
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Printer model**
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS, Windows]
- - Version [e.g. 22]
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -0,0 +1,114 @@
+name: Bug Report
+description: File a bug report
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Thank you for using Bambu Studio and wanting to report a bug.**
+        Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
+  - type: input
+    id: version
+    attributes:
+      label: Bambu Studio Version
+      description: Which version of Bambu Studio are you running? You can see the full version in `Help` -> `About Bambu Studio`.
+      placeholder: e.g. 1.6.2.4
+    validations:
+      required: true
+  - type: dropdown
+    id: app_from
+    attributes:
+      label: Where is the application from?
+      description: please confirm where is your Bambu Studio from
+      multiple: true
+      options:
+        - Bambu Lab Official website
+        - Bambu Lab github releases
+        - Built from source by yourself or others
+    validations:
+      required: true
+  - type: input
+    id: os_info
+    attributes:
+      label: OS version
+      description: Which OS version are you using?
+      placeholder: |
+        OS: Windows 7/8/10/11 ... , Ubuntu 22.04/Fedora 36 ... , macOS 10.15/11.1/12.3 ...
+    validations:
+      required: true
+  - type: textarea
+    id: system_info
+    attributes:
+      label: Additional system information
+      description: For the performance issue, please also show the CPU、Memory information; For the 3D Rendering issue, please also show the Display Card information.
+      placeholder: |
+        CPU: 11th gen intel r core tm i7-1185g7/amd ryzen 7 6800h/...
+        Memory: 32/16 GB...
+        Display Card: NVIDIA Quadro P400/...
+    validations:
+      required: false
+  - type: input
+    id: printer
+    attributes:
+      label: Printer
+      description: Which printer was selected
+      placeholder: Bambu Lab X1 series/Bambu Lab P1P/...
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce_steps
+    attributes:
+      label: How to reproduce
+      description: Please described the detailed steps to reproduce this issue
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: actual_results
+    attributes:
+      label: Actual results
+      description: What happens after the above steps? Please, enclose a screenshot whenever possible (even when you think the description is clear). 
+    validations:
+      required: true
+  - type: textarea
+    id: expected_results
+    attributes:
+      label: Expected results
+      description: What should happen after the above steps?
+    validations:
+      required: true
+  - type: markdown
+    id: file_required
+    attributes:
+      value: |
+        Please be sure to add the following files:
+          * Please upload a ZIP archive containing the **project file** used when the problem arise. Please export it just before or after the problem occurs. Even if you did nothing and/or there is no object, export it! (We need the configurations in project file).
+            You can export the project file from the application menu in `File`->`Save project as...`, then zip it
+          * A **log file** for crashes and similar issues.
+            You can find your log file here:
+            Windows: `%APPDATA%\BambuStudio\log` or usually `C:\Users\<your username>\AppData\Roaming\BambuStudio\log`
+            MacOS: `$HOME/Library/Application Support/BambuStudio/log`
+            Linux: `$HOME/.config/BambuStudio/log`
+            If Bambu Studio still starts, you can also reach this directory from the application menu in `Help` -> `Show Configuration Folder`
+            You can zip the log directory, or just select the newest logs when this issue happens, and zip them
+  - type: textarea
+    id: file_uploads
+    attributes:
+      label: Project file & Debug log uploads
+      description:  Drop the project file and debug log here
+      placeholder: |
+        Project File: `File` -> `Save project as...` then zip it & drop it here
+        Log File:  `Help` -> `Show Configuration Folder`, then zip the log directory, or just select the newest logs in `log` when this issue happens and zip them, then drop the zip file here
+    validations:
+      required: true
+  - type: checkboxes
+    id: file_checklist
+    attributes:
+      label: Checklist of files to include
+      options:
+        - label: Log file
+        - label: Project file
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -0,0 +1,12 @@
+contact_links:
+  - name: Do you need Support?
+    url: https://bambulab.com/en/support
+    about: You can find all the entries(FAQ/Official Wiki//General Inquiry/Technical Support/Documentation And Manuals/Official Community Forum) from here
+  - name: Technical Support
+    url: https://bambulab.com/en/my/support/tickets/create
+    about: You can file a ticket directly from here, especially for the printer related hardware/software issues.
+  - name: Bambu lab Community Forum
+    url: https://forum.bambulab.com/
+    about: Please get in touch on our Bambu lab Community Forum! (Not an official support channel.)
+    
+blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ b/.github/ISSUE_TEMPLATE/custom.md
@ -1,10 +0,0 @@
---
-name: Custom issue template
-about: For generic ideas such as enhancement of a feature, some questions, and etc.
-title: ''
-labels: ''
-assignees: ''
-
---
-
-
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@ -0,0 +1,117 @@
+name: Build Linux
+
+on: [pull_request]
+
+jobs:
+  appimage-builder:
+    name: Linux AppImage Build
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y
+      - name: Install dependencies from BuildLinux.sh
+        shell: bash
+        run: sudo ./BuildLinux.sh -ur
+      - name: Fix permissions
+        shell: bash
+        run: sudo chown $USER -R ./
+      - name: Build deps
+        id: cache_deps
+        uses: actions/cache@v3
+        env:
+          cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
+        with:
+          path: ${{ github.workspace }}/deps/build/destdir
+          key: build-${{ env.cache-name }}
+
+      - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
+        name: Build deps
+        working-directory: ${{ github.workspace }}
+        continue-on-error: true
+        run: ./BuildLinux.sh -dsr
+
+      - name: Build Studio
+        shell: bash
+        run: ./BuildLinux.sh -ir
+      - uses: actions/upload-artifact@v3
+        with:
+          name: BambuStudio_Linux_ubu64_20.04
+          path: './build/BambuStudio_ubu64.AppImage'
+
+  appimage-builder-using-container:
+    name: Linux AppImage Build Ubuntu 20.04 using container
+
+    runs-on: ubuntu-latest
+
+    # free disk space ref: https://github.com/actions/runner-images/issues/2840#issuecomment-1540506686
+    steps:
+      - name: Check disk space
+        run: df -h
+      - name: Free disk space
+        run: |
+          sudo docker rmi $(docker image ls -aq) || true
+          sudo swapoff /swapfile || true
+          sudo rm -rf /swapfile /usr/share/dotnet /usr/local/lib/android /opt/ghc  || true
+          sudo apt purge aria2 ansible azure-cli shellcheck rpm xorriso zsync \
+            clang-6.0 lldb-6.0 lld-6.0 clang-format-6.0 clang-8 lldb-8 lld-8 clang-format-8 \
+            clang-9 lldb-9 lld-9 clangd-9 clang-format-9 dotnet-sdk-3.0 dotnet-sdk-3.1=3.1.101-1 \
+            esl-erlang firefox g++-8 g++-9 gfortran-8 gfortran-9 google-chrome-stable \
+            google-cloud-sdk ghc-8.0.2 ghc-8.2.2 ghc-8.4.4 ghc-8.6.2 ghc-8.6.3 ghc-8.6.4 \
+            ghc-8.6.5 ghc-8.8.1 ghc-8.8.2 ghc-8.8.3 ghc-8.10.1 cabal-install-2.0 cabal-install-2.2 \
+            cabal-install-2.4 cabal-install-3.0 cabal-install-3.2 heroku imagemagick \
+            libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl \
+            mercurial apt-transport-https mono-complete mysql-client libmysqlclient-dev \
+            mysql-server mssql-tools unixodbc-dev yarn bazel chrpath libssl-dev libxft-dev \
+            libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev php7.1 php7.1-bcmath \
+            php7.1-bz2 php7.1-cgi php7.1-cli php7.1-common php7.1-curl php7.1-dba php7.1-dev \
+            php7.1-enchant php7.1-fpm php7.1-gd php7.1-gmp php7.1-imap php7.1-interbase php7.1-intl \
+            php7.1-json php7.1-ldap php7.1-mbstring php7.1-mcrypt php7.1-mysql php7.1-odbc \
+            php7.1-opcache php7.1-pgsql php7.1-phpdbg php7.1-pspell php7.1-readline php7.1-recode \
+            php7.1-snmp php7.1-soap php7.1-sqlite3 php7.1-sybase php7.1-tidy php7.1-xml \
+            php7.1-xmlrpc php7.1-xsl php7.1-zip php7.2 php7.2-bcmath php7.2-bz2 php7.2-cgi \
+            php7.2-cli php7.2-common php7.2-curl php7.2-dba php7.2-dev php7.2-enchant php7.2-fpm \
+            php7.2-gd php7.2-gmp php7.2-imap php7.2-interbase php7.2-intl php7.2-json php7.2-ldap \
+            php7.2-mbstring php7.2-mysql php7.2-odbc php7.2-opcache php7.2-pgsql php7.2-phpdbg \
+            php7.2-pspell php7.2-readline php7.2-recode php7.2-snmp php7.2-soap php7.2-sqlite3 \
+            php7.2-sybase php7.2-tidy php7.2-xml php7.2-xmlrpc php7.2-xsl php7.2-zip php7.3 \
+            php7.3-bcmath php7.3-bz2 php7.3-cgi php7.3-cli php7.3-common php7.3-curl php7.3-dba \
+            php7.3-dev php7.3-enchant php7.3-fpm php7.3-gd php7.3-gmp php7.3-imap php7.3-interbase \
+            php7.3-intl php7.3-json php7.3-ldap php7.3-mbstring php7.3-mysql php7.3-odbc \
+            php7.3-opcache php7.3-pgsql php7.3-phpdbg php7.3-pspell php7.3-readline php7.3-recode \
+            php7.3-snmp php7.3-soap php7.3-sqlite3 php7.3-sybase php7.3-tidy php7.3-xml \
+            php7.3-xmlrpc php7.3-xsl php7.3-zip php7.4 php7.4-bcmath php7.4-bz2 php7.4-cgi \
+            php7.4-cli php7.4-common php7.4-curl php7.4-dba php7.4-dev php7.4-enchant php7.4-fpm \
+            php7.4-gd php7.4-gmp php7.4-imap php7.4-interbase php7.4-intl php7.4-json php7.4-ldap \
+            php7.4-mbstring php7.4-mysql php7.4-odbc php7.4-opcache php7.4-pgsql php7.4-phpdbg \
+            php7.4-pspell php7.4-readline php7.4-snmp php7.4-soap php7.4-sqlite3 php7.4-sybase \
+            php7.4-tidy php7.4-xml php7.4-xmlrpc php7.4-xsl php7.4-zip php-amqp php-apcu \
+            php-igbinary php-memcache php-memcached php-mongodb php-redis php-xdebug \
+            php-zmq snmp pollinate libpq-dev postgresql-client powershell ruby-full \
+            sphinxsearch subversion mongodb-org -yq >/dev/null 2>&1 || true
+          sudo apt-get autoremove -y >/dev/null 2>&1 || true
+          sudo apt-get autoclean -y >/dev/null 2>&1 || true
+      - name: Check disk space
+        run: df -h
+      - uses: actions/checkout@v3
+      - name: Install podman
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y podman
+      - name: Build
+        shell: bash
+        run: |
+          rm -rf build
+          podman buildx build --build-arg BUILD_LINUX_EXTRA_ARGS=-r -t bambu-studio-builder:latest .
+          podman run -d -it --name bambu-studio-builder bambu-studio-builder:latest /bin/bash -c 'tail -f /dev/null'
+          podman cp bambu-studio-builder:/BambuStudio/build/BambuStudio_ubu64.AppImage ./
+          podman stop bambu-studio-builder
+          podman rm bambu-studio-builder
+      - uses: actions/upload-artifact@v3
+        with:
+          name: BambuStudio_Linux_ubu64_using_container
+          path: './BambuStudio_ubu64.AppImage'
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 Build
 Build.bat
-/build*/
+/build/
+/build2022/
 deps/build
 MYMETA.json
 MYMETA.yml
@ -18,11 +19,8 @@ local-lib
 /src/TAGS
 /.vscode/
 build-linux/*
-deps/build*/*
+deps/build-linux/*
 **/.DS_Store
 install_*
 build_*/
 SVG
-src/OrcaSlicer-doc/
-.idea/
-/.cache/
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/.idea/OrcaSlicer.iml
+++ b/.idea/OrcaSlicer.iml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <clangFormatSettings>
+      <option name="ENABLED" value="true" />
+    </clangFormatSettings>
+  </code_scheme>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/OrcaSlicer.iml" filepath="$PROJECT_DIR$/.idea/OrcaSlicer.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -280,6 +280,11 @@ if (APPLE)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=partial-availability -Werror=unguarded-availability -Werror=unguarded-availability-new")
 endif ()

+if(MSVC)
+# 添加编译选项，忽略警告 C4305 （格式转换截断）
+add_compile_options(/wd4305)
+endif()
+
 # Where all the bundled libraries reside?
 set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 set(LIBDIR_BIN ${CMAKE_CURRENT_BINARY_DIR}/src)
@ -671,7 +676,6 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
        ${_out_dir}/TKXSBase.dll

        ${_out_dir}/freetype.dll
-
        PARENT_SCOPE
    )
    
--- a/72
+++ b/72
@ -0,0 +1,72 @@
+# Build Bambu Slicer in a container
+#
+# Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md):
+# rm -rf build; podman build . -t bambu-studio-builder && podman run --rm localhost/bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
+#
+# Troubleshooting the build container:
+# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash
+#
+# Debugging the resulting AppImage:
+#   1) Install `gdb`
+#   2) In a terminal in the same directory as the AppImage, start it with following:
+#      echo -e "run\nbt\nquit" | gdb ./BambuStudio_ubu64.AppImage
+#   3) Find related issue using backtrace output for clues and add backtrace to it on github
+#
+# Docker alternative AppImage build syntax (use this if you can't install podman):
+# rm -rf build; docker build . --file Containerfile -t bambu-studio-builder; docker run --rm bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
+#
+#
+# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.
+
+FROM docker.io/ubuntu:20.04
+LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
+ARG BUILD_LINUX_EXTRA_ARGS=""
+
+# Disable interactive package configuration
+RUN apt-get update && \
+    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+# Add a deb-src
+RUN echo deb-src http://archive.ubuntu.com/ubuntu \
+    $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list 
+
+RUN apt-get update && apt-get install  -y \
+    git \
+    build-essential \
+    autoconf pkgconf m4 \
+    cmake extra-cmake-modules \
+    libglu1-mesa-dev libglu1-mesa-dev \
+    libwayland-dev libxkbcommon-dev wayland-protocols \
+    eglexternalplatform-dev libglew-dev \
+    libgtk-3-dev \
+    libdbus-1-dev \
+    libcairo2-dev \
+    libgtk-3-dev libwebkit2gtk-4.0-dev \
+    libsoup2.4-dev \
+    libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev libgstreamerd-3-dev \
+    libmspack-dev \
+    libosmesa6-dev \
+    libssl-dev libcurl4-openssl-dev libsecret-1-dev \
+    libudev-dev \
+    curl \
+    wget \
+    file \
+    sudo
+
+COPY ./ BambuStudio
+
+WORKDIR BambuStudio
+
+# These can run together, but we run them seperate for podman caching
+# Update System dependencies
+RUN ./BuildLinux.sh -u ${BUILD_LINUX_EXTRA_ARGS}
+
+# Build dependencies in ./deps
+RUN ./BuildLinux.sh -d ${BUILD_LINUX_EXTRA_ARGS}
+
+# Build slic3r
+RUN ./BuildLinux.sh -s ${BUILD_LINUX_EXTRA_ARGS}
+
+# Build AppImage
+ENV container podman
+RUN ./BuildLinux.sh -i ${BUILD_LINUX_EXTRA_ARGS}
--- a/94
+++ b/94
@ -0,0 +1,94 @@
+FROM docker.io/ubuntu:20.04
+LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
+
+# Disable interactive package configuration
+RUN apt-get update && \
+    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+# Add a deb-src
+RUN echo deb-src http://archive.ubuntu.com/ubuntu \
+    $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list 
+
+RUN apt-get update && apt-get install  -y \
+    autoconf \
+    build-essential \
+    cmake \
+    curl \
+    eglexternalplatform-dev \
+    extra-cmake-modules \
+    file \
+    git \
+    gstreamer1.0-plugins-bad \
+    gstreamer1.0-libav \
+    libcairo2-dev \
+    libcurl4-openssl-dev \
+    libdbus-1-dev \
+    libglew-dev \ 
+    libglu1-mesa-dev \
+    libglu1-mesa-dev \
+    libgstreamer1.0-dev \
+    libgstreamerd-3-dev \ 
+    libgstreamer-plugins-base1.0-dev \
+    libgstreamer-plugins-good1.0-dev \
+    libgtk-3-dev \
+    libgtk-3-dev \
+    libmspack-dev \
+    libosmesa6-dev \
+    libsecret-1-dev \
+    libsoup2.4-dev \
+    libssl-dev \
+    libudev-dev \
+    libwayland-dev \
+    libwebkit2gtk-4.0-dev \
+    libxkbcommon-dev \
+    locales \
+    locales-all \
+    m4 \
+    pkgconf \
+    sudo \
+    wayland-protocols \
+    wget 
+
+# Change your locale here if you want.  See the output
+# of `locale -a` to pick the correct string formatting.
+ENV LC_ALL=en_US.utf8
+RUN locale-gen $LC_ALL
+
+# Set this so that Bambu Studio doesn't complain about
+# the CA cert path on every startup
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+
+COPY ./ BambuStudio
+
+WORKDIR BambuStudio
+
+# These can run together, but we run them seperate for podman caching
+# Update System dependencies
+RUN ./BuildLinux.sh -u
+
+# Build dependencies in ./deps
+RUN ./BuildLinux.sh -d
+
+# Build slic3r
+RUN ./BuildLinux.sh -s
+
+# Build AppImage
+ENV container podman
+RUN ./BuildLinux.sh -i
+
+# It's easier to run Bambu Studio as the same username,
+# UID and GID as your workstation.  Since we bind mount
+# your home directory into the container, it's handy
+# to keep permissions the same.  Just in case, defaults
+# are root.
+SHELL ["/bin/bash", "-l", "-c"]
+ARG USER=root
+ARG UID=0
+ARG GID=0
+RUN [[ "$UID" != "0" ]] \
+  && groupadd -f -g $GID $USER \
+  && useradd -u $UID -g $GID $USER
+
+# Using an entrypoint instead of CMD because the binary
+# accepts several command line arguments.
+ENTRYPOINT ["/BambuStudio/build/package/bin/bambu-studio"]
--- a/README.md
+++ b/README.md
@ -1,86 +1,48 @@
+![image](https://user-images.githubusercontent.com/106916061/179006347-497d24c0-9bd6-45b7-8c49-d5cc8ecfe5d7.png)
+# Work with us!
+If you are interested in working with us in China, please apply to our open positions below by simply sending your resume to our mailbox [zhaopin at bambulab.com].
+- [Graphics Algorithm Engineer](https://bambulab.jobs.feishu.cn/experienced/position/7139785303246637342/detail)
+- [Software Engineer C++](https://bambulab.jobs.feishu.cn/experienced/position/7088880036707420446/detail)
+# BambuStudio
+Bambu Studio is a cutting-edge, feature-rich slicing software.  
+It contains project-based workflows, systematically optimized slicing algorithms, and an easy-to-use graphic interface, bringing users an incredibly smooth printing experience.

-[![Build Win64](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_win.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_win.yml)
-[![Build Mac AppleSilicon](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_arm64.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_arm64.yml)
-[![Build Mac Intel](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_x64.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_x64.yml)
-[![Build Linux](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_linux.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_linux.yml)
+Prebuilt Windows, macOS 64-bit and Linux releases are available through the [github releases page](https://github.com/bambulab/BambuStudio/releases/).

-# Orca Slicer     
-Orca Slicer is an open source slicer for FDM printers.   
-You can download Orca Slicer here: [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/).  
-![discord-mark-blue](https://github.com/SoftFever/OrcaSlicer/assets/103989404/b97d5ffc-072d-4d0a-bbda-e67ef373876f) Join community: [OrcaSlicer Official Discord Server](https://discord.gg/WTEkCR6SnV)   
+Bambu Studio is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.

-# Main features
- Auto calibrations for all printers
- Sandwich(inner-outer-inner) mode - an improved version of the `External perimeters first` mode
- Precise wall
- Klipper support
- More granular controls
- More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)  
+See the [wiki](https://github.com/bambulab/BambuStudio/wiki) and the [documentation directory](https://github.com/bambulab/BambuStudio/tree/master/doc) for more informations.

-### Some background
-OrcaSlicer is fork of Bambu Studio  
-It was previously known as BambuStudio-SoftFever  
-Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
-Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
-Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
+# What are Bambu Studio's main features?
+Key features are:
+- Basic slicing features & GCode viewer
+- Multiple plates management
+- Remote control & monitoring
+- Auto-arrange objects
+- Auto-orient objects
+- Hybrid/Tree/Normal support types, Customized support
+- multi-material printing and rich painting tools
+- multi-platform (Win/Mac/Linux) support
+- Global/Object/Part level slicing parameters

-# How to install
-**Windows**: 
-1.  Unzip the binaries to any folder you prefer, then execute orca-slicer.exe to start the application.  
-    - *If you have troubles to run the build, you might need to install following runtimes:*
-      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)  
-      - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)  
+Other major features are:
+- Advanced cooling logic controlling fan speed and dynamic print speed
+- Auto brim according to mechanical analysis
+- Support arc path(G2/G3)
+- Support STEP format
+- Assembly & explosion view
+- Flushing transition-filament into infill/object during filament change

-**Mac**:
-1. Download the right binaries for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.  
-2. Double click to unzip the package, move OrcaSlicer.app to Application folder.  
-3. The app is signed but not notarized at the moment due to the proptiery network plugin.  
-    We have two options to make it run on our machines  
-  - Option 1 (You only need to do this once. After that the app can be oppened normally.):
-    - Step 1: Hold _cmd_ and right click the app, from the context menu choose **Open**.
-    - Step 2: A warning window will pop up, click _Open_  
-    
-  - Option 2:  
-    Execute this command in terminal: `xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app`
-     ```console
-        softfever@mac:~$ xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app
-    ```
-  - Option 3:  
-      - Step 1: open the app, a warning window will pop up  
-          ![image](./SoftFever_doc/mac_cant_open.png)  
-      - Step 2: in `System Settings` -> `Privacy & Security`, click `Open Anyway`:  
-          ![image](./SoftFever_doc/mac_security_setting.png)  
-
-**Linux(Ubuntu)**:
- 1. If you run into trouble to execute it, try this command in terminal:  
-    `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
 # How to compile
- Windows 64-bit  
-  - Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
-  - Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
+Following platforms are currently supported to compile:
+- Windows 64-bit, [Compile Guide](https://github.com/bambulab/BambuStudio/wiki/Windows-Compile-Guide)
+- Mac 64-bit, [Compile Guide](https://github.com/bambulab/BambuStudio/wiki/Mac-Compile-Guide)
+- Linux, [Compile Guide](https://github.com/bambulab/BambuStudio/wiki/Linux-Compile-Guide)

- Mac 64-bit  
-  - Tools needed: Xcode, Cmake, git, gettext
-  - run `build_release_macos.sh`
-
- Ubuntu  
-  - run `BuildLinux.sh -udisr`
-
-
-# Note: 
-If you're running Klipper, it's recommended to add the following configuration to your `printer.cfg` file.
-```
-# Enable object exclusion
-[exclude_object]
-
-# Enable arcs support
-[gcode_arcs]
-resolution: 0.1
-```
+# Report issue
+You can add an issue to the [github tracker](https://github.com/bambulab/BambuStudio/issues) if **it isn't already present.**

 # License
-Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab.
-
 Bambu Studio is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.

 PrusaSlicer is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
@ -89,7 +51,5 @@ Slic3r is licensed under the GNU Affero General Public License, version 3. Slic3

 The GNU Affero General Public License, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.

-Orca Slicer includes a pressure advance calibration pattern test adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
-
-The bambu networking plugin is based on non-free libraries from Bambulab. It is optional to the Orca Slicer and provides extended functionalities for Bambulab printer users.
+The bambu networking plugin is based on non-free libraries. It is optional to the Bambu Studio and provides extended functionalities for users.

--- a/Readme.txt
+++ b/Readme.txt
@ -1 +0,0 @@
-Init Version
--- a/bbl/i18n/ko/BambuStudio_ko.po
+++ b/bbl/i18n/ko/BambuStudio_ko.po
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@ -26,6 +26,17 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+  <key>CFBundleURLTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleURLName</key>
+      <string>bambustudioopen url</string>
+      <key>CFBundleURLSchemes</key>
+      <array>
+        <string>bambustudioopen</string>
+      </array>
+    </dict>
+  </array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
--- a/deps/Boost/Boost.cmake
+++ b/deps/Boost/Boost.cmake
@ -1,24 +1,17 @@
 include(ExternalProject)

-# Use boost 1.78 for Windows, to support VS2022
 if (WIN32)
-	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz")
-	set(_boost_hash 94CED8B72956591C4775AE2207A9763D3600B30D9D7446562C552F0A14A63BE7)
    set(_bootstrap_cmd bootstrap.bat)
    set(_build_cmd  b2.exe)
 else()
-	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz")
-	set(_boost_hash AEB26F80E80945E82EE93E5939BAEBDCA47B9DEE80A07D3144BE1E1A6A66DD6A)
    set(_bootstrap_cmd ./bootstrap.sh)
    set(_build_cmd ./b2)
 endif()

-set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam)
-
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
    set(_boost_toolset gcc)
-    set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
+    set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
    # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
    if (MSVC_VERSION EQUAL 1800)
@ -42,8 +35,12 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    if (WIN32)
        set(_boost_toolset "clang-win")
-    else()
+    elseif (APPLE)
        set(_boost_toolset "clang")
+    else()
+        set(_boost_toolset clang)
+        configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
+        set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
    endif()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
    set(_boost_toolset "intel")
@ -75,6 +72,18 @@ include(ProcessorCount)
 ProcessorCount(NPROC)
 file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)

+set(_boost_flags "")
+if (UNIX)
+    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
+endif ()
+
+if(APPLE)
+    set(_boost_flags 
+        "cflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "cxxflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mmflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET}") 
+endif()

 set(_boost_variants "")
 if(CMAKE_BUILD_TYPE)
@ -90,7 +99,7 @@ if (_cfg_rel GREATER -1 OR _cfg_relwdeb GREATER -1 OR _cfg_minsizerel GREATER -1
    list(APPEND _boost_variants release)
 endif()

-if (MSVC AND ${DEP_DEBUG} )
+if ( (NOT MSVC AND _cfg_deb GREATER -1) OR (MSVC AND ${DEP_DEBUG}) )
    list(APPEND _boost_variants debug)
 endif()

@ -98,38 +107,8 @@ if (NOT _boost_variants)
    set(_boost_variants release)
 endif()

-if (IS_CROSS_COMPILE AND APPLE)
-    if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
-        message(STATUS "Compiling Boost for arm64.")
-        message(STATUS "Compiling Boost with toolset ${_boost_toolset}.")
-        message(STATUS "Compiling Boost with libs ${_libs}.")
-        message(STATUS "Compiling Boost with variant ${_boost_variants}.")
-        message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.")
-        message(STATUS "_boost_linkflags = ${_boost_linkflags}")
-        set(_arch_flags "-arch arm64")
-        set(_boost_linkflags "linkflags=${_arch_flags}")
-        message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'")
-    elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
-        message(STATUS "Compiling Boost for x86_64.")
-        set(_arch_flags "-arch x86_64")
-    endif()
-    set(_boost_linkflags "linkflags=${_arch_flags}")
-endif ()
-
-set(_boost_flags "")
-if(APPLE)
-    set(_boost_flags 
-        "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}") 
-elseif (UNIX)
-    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
-endif()
-
 set(_build_cmd ${_build_cmd}
               ${_boost_flags}
-               ${_boost_linkflags}
               -j${NPROC}
               ${_libs}
               --layout=versioned
@ -145,15 +124,12 @@ set(_build_cmd ${_build_cmd}

 set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)

-if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
-    message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'")
-    message(STATUS "Standard boost build with patch command '${_patch_command}'")
-    message(STATUS "Standard boost build with build command '${_build_cmd}'")
-    message(STATUS "Standard boost build with install command '${_install_cmd}'")
+list(APPEND _patch_command COMMAND git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-Boost-fix.patch)
+
 ExternalProject_Add(
    dep_Boost
-	URL ${_boost_url}
-    URL_HASH SHA256=${_boost_hash}
+    URL "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip"
+    URL_HASH SHA256=f22143b5528e081123c3c5ed437e92f648fe69748e95fa6e2bd41484e2986cc3
    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
    CONFIGURE_COMMAND "${_bootstrap_cmd}"
    PATCH_COMMAND ${_patch_command}
@ -162,26 +138,7 @@ ExternalProject_Add(
    INSTALL_COMMAND "${_install_cmd}"
 )

-else()
-
-ExternalProject_Add(
-    dep_Boost
-	URL ${_boost_url}
-    URL_HASH SHA256=${_boost_hash}
-    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
-    CONFIGURE_COMMAND ./bootstrap.sh
-        --with-toolset=clang
-        --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
-        "--prefix=${DESTDIR}/usr/local"
-#    PATCH_COMMAND ${_patch_command}
-    BUILD_COMMAND "${_build_cmd}"
-    BUILD_IN_SOURCE    ON
-    INSTALL_COMMAND "${_install_cmd}"
-)
-endif()
-
 if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-    message(STATUS "Patch the boost::polygon library with a custom one.")
    # Patch the boost::polygon library with a custom one.
    ExternalProject_Add(dep_boost_polygon
        EXCLUDE_FROM_ALL ON
@ -193,11 +150,10 @@ if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
        DEPENDS dep_Boost
        CONFIGURE_COMMAND ""
        BUILD_COMMAND ""
-        ${_cmake_args_osx_arch}
        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
            "${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon"
            "${DESTDIR}/usr/local/include/boost/polygon"
    )
    # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
    list(APPEND _dep_list "dep_boost_polygon")
-endif ()
+endif ()
--- a/deps/CGAL/CGAL.cmake
+++ b/deps/CGAL/CGAL.cmake
@ -1,31 +1,11 @@
 orcaslicer_add_cmake_project(
    CGAL
-     GIT_REPOSITORY https://github.com/CGAL/cgal.git
-     GIT_TAG        caacd806dc55c61cc68adaad99f2240f00493b29 # releases/CGAL-5.3
+    # GIT_REPOSITORY https://github.com/CGAL/cgal.git
+    # GIT_TAG        caacd806dc55c61cc68adaad99f2240f00493b29 # releases/CGAL-5.3
    # For whatever reason, this keeps downloading forever (repeats downloads if finished)
-    #URL      https://github.com/CGAL/cgal/archive/releases/CGAL-5.0.zip
-    #URL_HASH SHA256=c2b035bd078687b6d8c0fb6371a7443adcdb647856af9969532c4050cd5f48e5
+    URL      https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip
+    URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0
    DEPENDS dep_Boost dep_GMP dep_MPFR
 )

 include(GNUInstallDirs)
-
-# CGAL, for whatever reason, makes itself non-relocatable by writing the build directory into
-# CGALConfig-installation-dirs.cmake and including it in configure time.
-# If this file is not present, it will not consider the stored absolute path
-ExternalProject_Add_Step(dep_CGAL dep_CGAL_relocation_fix
-    DEPENDEES install
-
-    COMMAND ${CMAKE_COMMAND} -E remove CGALConfig-installation-dirs.cmake
-    WORKING_DIRECTORY "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL"
-)
-
-# Again, for whatever reason, CGAL thinks that its version is not relevant if
-# configured as a header only library. Fixing it by placing a cmake version file
-# besides the installed config file.
-ExternalProject_Add_Step(dep_CGAL dep_CGAL_version_fix
-    DEPENDEES install
-
-    COMMAND ${CMAKE_COMMAND} -E copy cgal/CGALConfigVersion.cmake "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL/CGALConfigVersion.cmake"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
-)
--- a/deps/CURL/CURL.cmake
+++ b/deps/CURL/CURL.cmake
@ -65,6 +65,7 @@ orcaslicer_add_cmake_project(CURL
  #                     ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/curl-mods.patch
  CMAKE_ARGS
    -DBUILD_TESTING:BOOL=OFF
+    -DBUILD_CURL_EXE:BOOL=OFF
    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
    -DCURL_STATICLIB=${_curl_static}
    ${_curl_platform_flags}
--- a/deps/GMP/GMP.cmake
+++ b/deps/GMP/GMP.cmake
@ -57,8 +57,8 @@ else ()
    endif ()

    ExternalProject_Add(dep_GMP
-        URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2
-        URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
+        URL https://github.com/bambulab/gmp/archive/refs/tags/6.2.1.tar.gz
+        URL_HASH SHA256=705ae57ee2014b2c6fc0f572c85ee43276b99b6b256ee16c1a9d3a8c4e3609d5
        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
        BUILD_IN_SOURCE ON 
        CONFIGURE_COMMAND  env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt}
--- a/deps/OpenEXR/OpenEXR.cmake
+++ b/deps/OpenEXR/OpenEXR.cmake
@ -1,46 +1,8 @@
-# Check if we're building for arm on x86_64 and just for OpenEXR, build fat
-# binaries.  We need this because it compiles some code to generate other
-# source and we need to be able to run the executables.  When we link the
-# library, the x86_64 part will be ignored.
-if (APPLE AND IS_CROSS_COMPILE)
-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND ${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
-        set(_openexr_arch arm64^^x86_64)
-        set(_openxr_list_sep LIST_SEPARATOR ^^)
-        set(_cmake_openexr_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${_openexr_arch})
-    else()
-        set(_openexr_arch ${CMAKE_OSX_ARCHITECTURES})
-        set(_cmake_openexr_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${_openexr_arch})
-    endif()
-    ExternalProject_Add(dep_OpenEXR
-        EXCLUDE_FROM_ALL    ON
-        URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
-        URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
-        INSTALL_DIR         ${DESTDIR}/usr/local
-        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/OpenEXR
-        ${_openxr_list_sep}
-        CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
-            -DBUILD_SHARED_LIBS:BOOL=OFF
-            -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-            -DBUILD_TESTING=OFF 
-            -DPYILMBASE_ENABLE:BOOL=OFF 
-            -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
-            -DOPENEXR_BUILD_UTILS:BOOL=OFF
-            ${_cmake_openexr_arch}
-    )
-else()
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OpenEXR-GCC13.patch)
-else ()
-    set(_patch_cmd "")
-endif ()
-
-orcaslicer_add_cmake_project(OpenEXR
+bambustudio_add_cmake_project(OpenEXR
    # GIT_REPOSITORY https://github.com/openexr/openexr.git
    URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
    URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
-    PATCH_COMMAND ${_patch_cmd}
+    PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OpenEXR-GCC13.patch
    DEPENDS ${ZLIB_PKG}
    GIT_TAG v2.5.5
    CMAKE_ARGS
@ -50,7 +12,6 @@ orcaslicer_add_cmake_project(OpenEXR
        -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
        -DOPENEXR_BUILD_UTILS:BOOL=OFF
 )
-endif()

 if (MSVC)
    add_debug_dep(dep_OpenEXR)
--- a/deps/OpenVDB/OpenVDB.cmake
+++ b/deps/OpenVDB/OpenVDB.cmake
@ -6,10 +6,17 @@ else()
    set(_build_static ON)
 endif()

-orcaslicer_add_cmake_project(OpenVDB
-    #  support vs2022, update to 8.2
-    URL https://github.com/tamasmeszaros/openvdb/archive/a68fd58d0e2b85f01adeb8b13d7555183ab10aa5.zip 
+set (_openvdb_vdbprint ON)
+#if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+    # Build fails on raspberry pi due to missing link directive to latomic
+    # Let's hope it will be fixed soon.
+    #set (_openvdb_vdbprint OFF)
+#endif ()
+bambustudio_add_cmake_project(OpenVDB    
+    URL https://github.com/tamasmeszaros/openvdb/archive/a68fd58d0e2b85f01adeb8b13d7555183ab10aa5.zip # 8.2 patched
    URL_HASH SHA256=f353e7b99bd0cbfc27ac9082de51acf32a8bc0b3e21ff9661ecca6f205ec1d81
+    # URL https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v10.0.1.zip
+    # URL_HASH SHA256=48C2CFA9853B58FA86282DF1F83F0E99D07858CC03EB2BA8227DC447A830100A
    DEPENDS dep_TBB dep_Blosc dep_OpenEXR dep_Boost
    CMAKE_ARGS
        -DCMAKE_POSITION_INDEPENDENT_CODE=ON 
@ -19,7 +26,7 @@ orcaslicer_add_cmake_project(OpenVDB
        -DOPENVDB_CORE_STATIC=${_build_static}
        -DOPENVDB_ENABLE_RPATH:BOOL=OFF
        -DTBB_STATIC=${_build_static}
-        -DOPENVDB_BUILD_VDB_PRINT=ON
+        -DOPENVDB_BUILD_VDB_PRINT=${_openvdb_vdbprint}
        -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON # Centos6 has old zlib
 )

@ -34,4 +41,4 @@ if (MSVC)
            WORKING_DIRECTORY "${BINARY_DIR}"
        )
    endif ()
-endif ()
+endif ()
--- a/doc/How
+++ b/doc/How
@ -0,0 +1,67 @@
+
+# Building Bambu Studio on MacOS
+
+## Enviroment setup
+
+Install Following tools:
+
+- Xcode from app store
+- Cmake
+- git
+- gettext
+
+Cmake, git, gettext can be installed from brew(brew install cmake git gettext)
+
+## Building the dependencies
+
+You need to build the dependencies of BambuStudio first. (Only needs for the first time)
+
+Suppose you download the codes into `/Users/_username_/work/projects/BambuStudio`.
+
+Create a directory to store the built dependencies: `/Users/_username_/work/projects/BambuStudio_dep`.
+**(Please make sure to replace the username with the one on your computer)**
+
+Then:
+
+```shell
+cd BambuStudio/deps
+mkdir build
+cd build
+```
+
+Next, for arm64 architecture:
+```shell
+cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"
+make
+```
+
+Or, for x86 architeccture:
+```shell
+cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"
+make -jN
+```
+(N can be a number between 1 and the max cpu number)  
+
+## Building Bambu Studio
+
+Create a directory to store the installed files at `/Users/username/work/projects/BambuStudio/install_dir`:
+
+```shell
+cd BambuStudio
+mkdir install_dir
+mkdir build
+cd build
+```
+
+To build using CMake:
+
+```shell
+cmake ..  -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on
+cmake --build . --target install --config Release -jN
+```
+
+To build for use with XCode:
+
+```shell
+cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on
+```
--- a/localization/i18n/OrcaSlicer.pot
+++ b/localization/i18n/OrcaSlicer.pot
--- a/localization/i18n/de/OrcaSlicer_de.po
+++ b/localization/i18n/de/OrcaSlicer_de.po
--- a/localization/i18n/en/OrcaSlicer_en.po
+++ b/localization/i18n/en/OrcaSlicer_en.po
--- a/localization/i18n/es/OrcaSlicer_es.po
+++ b/localization/i18n/es/OrcaSlicer_es.po
--- a/localization/i18n/fr/OrcaSlicer_fr.po
+++ b/localization/i18n/fr/OrcaSlicer_fr.po
--- a/localization/i18n/hu/OrcaSlicer_hu.po
+++ b/localization/i18n/hu/OrcaSlicer_hu.po
--- a/localization/i18n/it/OrcaSlicer_it.po
+++ b/localization/i18n/it/OrcaSlicer_it.po
--- a/localization/i18n/ja/OrcaSlicer_ja.po
+++ b/localization/i18n/ja/OrcaSlicer_ja.po
--- a/localization/i18n/list.txt
+++ b/localization/i18n/list.txt
@ -132,8 +132,16 @@ src/libslic3r/PlaceholderParser.cpp
 src/libslic3r/TreeSupport.cpp
 src/libslic3r/Model.cpp
 src/libslic3r/Format/OBJ.cpp
-src/slic3r/GUI/BonjourDialog.cpp
-src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
-src/slic3r/GUI/PrintHostDialogs.cpp
+src/slic3r/GUI/CalibrationWizardPage.cpp
+src/slic3r/GUI/CalibrationPanel.cpp
+src/slic3r/GUI/CalibrationWizard.cpp
+src/slic3r/GUI/CalibrationWizardStartPage.cpp
+src/slic3r/GUI/CalibrationWizardSavePage.cpp
+src/slic3r/GUI/CalibrationWizardPresetPage.cpp
+src/slic3r/GUI/CalibrationWizardCaliPage.cpp
+src/slic3r/GUI/CaliHistoryDialog.cpp
 src/slic3r/GUI/calib_dlg.cpp
-src/slic3r/GUI/PhysicalPrinterDialog.cpp
+src/slic3r/GUI/BonjourDialog.cpp
+src/slic3r/GUI/calib_dlg.cpp
+src/slic3r/GUI/PrintHostDialogs.cpp
+src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
--- a/localization/i18n/nl/OrcaSlicer_nl.po
+++ b/localization/i18n/nl/OrcaSlicer_nl.po
--- a/localization/i18n/sv/OrcaSlicer_sv.po
+++ b/localization/i18n/sv/OrcaSlicer_sv.po
--- a/localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
+++ b/localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
--- a/resources/calib/pressure_advance/pressure_advance_test.stl
+++ b/resources/calib/pressure_advance/pressure_advance_test.stl
--- a/resources/calib/pressure_advance/tower.stl
+++ b/resources/calib/pressure_advance/tower.stl
--- a/resources/calib/pressure_advance/tower_with_seam.stl
+++ b/resources/calib/pressure_advance/tower_with_seam.stl
--- a/resources/i18n/de/BambuStudio.mo
+++ b/resources/i18n/de/BambuStudio.mo
--- a/resources/i18n/en/BambuStudio.mo
+++ b/resources/i18n/en/BambuStudio.mo
--- a/resources/i18n/es/BambuStudio.mo
+++ b/resources/i18n/es/BambuStudio.mo
--- a/resources/i18n/fr/BambuStudio.mo
+++ b/resources/i18n/fr/BambuStudio.mo
--- a/resources/i18n/hu/BambuStudio.mo
+++ b/resources/i18n/hu/BambuStudio.mo
--- a/resources/i18n/it/BambuStudio.mo
+++ b/resources/i18n/it/BambuStudio.mo
--- a/resources/i18n/ja/BambuStudio.mo
+++ b/resources/i18n/ja/BambuStudio.mo
--- a/resources/i18n/ko/BambuStudio.mo
+++ b/resources/i18n/ko/BambuStudio.mo
--- a/resources/i18n/nl/BambuStudio.mo
+++ b/resources/i18n/nl/BambuStudio.mo
--- a/resources/i18n/sv/BambuStudio.mo
+++ b/resources/i18n/sv/BambuStudio.mo
--- a/resources/i18n/zh_cn/BambuStudio.mo
+++ b/resources/i18n/zh_cn/BambuStudio.mo
--- a/resources/images/cali_fdc_editing_diagram.png
+++ b/resources/images/cali_fdc_editing_diagram.png
--- a/resources/images/cali_fdc_editing_diagram_CN.png
+++ b/resources/images/cali_fdc_editing_diagram_CN.png
--- a/resources/images/cali_page_after_pa.png
+++ b/resources/images/cali_page_after_pa.png
--- a/resources/images/cali_page_after_pa_CN.png
+++ b/resources/images/cali_page_after_pa_CN.png
--- a/resources/images/cali_page_before_pa.png
+++ b/resources/images/cali_page_before_pa.png
--- a/resources/images/cali_page_before_pa_CN.png
+++ b/resources/images/cali_page_before_pa_CN.png
--- a/resources/images/cali_page_caption_help.svg
+++ b/resources/images/cali_page_caption_help.svg
@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="24" fill="#D9D9D9"/>
+<path d="M18.96 19.68C19.2933 18.7067 19.86 17.9533 20.66 17.42C21.4733 16.8733 22.4067 16.6 23.46 16.6C24.2467 16.6 24.94 16.7533 25.54 17.06C26.14 17.3533 26.6067 17.7667 26.94 18.3C27.2733 18.82 27.44 19.4067 27.44 20.06C27.44 20.7267 27.28 21.2867 26.96 21.74C26.6533 22.18 26.1867 22.6733 25.56 23.22C25.12 23.6333 24.7667 23.9867 24.5 24.28C24.2333 24.5733 24.0067 24.9267 23.82 25.34C23.6467 25.74 23.56 26.2067 23.56 26.74C23.56 27.1133 23.6067 27.4933 23.7 27.88H22.32C22.1467 27.28 22.06 26.7267 22.06 26.22C22.06 25.6733 22.1467 25.1933 22.32 24.78C22.5067 24.3533 22.7267 24 22.98 23.72C23.2333 23.4267 23.5733 23.08 24 22.68C24.52 22.2133 24.9067 21.8067 25.16 21.46C25.4133 21.1 25.54 20.68 25.54 20.2C25.54 19.6 25.3333 19.12 24.92 18.76C24.5067 18.4 23.9667 18.22 23.3 18.22C21.94 18.22 20.9533 18.9733 20.34 20.48L18.96 19.68ZM23.18 32.22C22.8733 32.22 22.6067 32.1067 22.38 31.88C22.1667 31.6533 22.06 31.3867 22.06 31.08C22.06 30.76 22.1667 30.4867 22.38 30.26C22.6067 30.0333 22.8733 29.92 23.18 29.92C23.5 29.92 23.7667 30.0333 23.98 30.26C24.2067 30.4867 24.32 30.76 24.32 31.08C24.32 31.3867 24.2067 31.6533 23.98 31.88C23.7667 32.1067 23.5 32.22 23.18 32.22Z" fill="black"/>
+</svg>
--- a/resources/images/cali_page_caption_help_hover.svg
+++ b/resources/images/cali_page_caption_help_hover.svg
@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="24" fill="#D9D9D9"/>
+<path d="M18.96 19.68C19.2933 18.7067 19.86 17.9533 20.66 17.42C21.4733 16.8733 22.4067 16.6 23.46 16.6C24.2467 16.6 24.94 16.7533 25.54 17.06C26.14 17.3533 26.6067 17.7667 26.94 18.3C27.2733 18.82 27.44 19.4067 27.44 20.06C27.44 20.7267 27.28 21.2867 26.96 21.74C26.6533 22.18 26.1867 22.6733 25.56 23.22C25.12 23.6333 24.7667 23.9867 24.5 24.28C24.2333 24.5733 24.0067 24.9267 23.82 25.34C23.6467 25.74 23.56 26.2067 23.56 26.74C23.56 27.1133 23.6067 27.4933 23.7 27.88H22.32C22.1467 27.28 22.06 26.7267 22.06 26.22C22.06 25.6733 22.1467 25.1933 22.32 24.78C22.5067 24.3533 22.7267 24 22.98 23.72C23.2333 23.4267 23.5733 23.08 24 22.68C24.52 22.2133 24.9067 21.8067 25.16 21.46C25.4133 21.1 25.54 20.68 25.54 20.2C25.54 19.6 25.3333 19.12 24.92 18.76C24.5067 18.4 23.9667 18.22 23.3 18.22C21.94 18.22 20.9533 18.9733 20.34 20.48L18.96 19.68ZM23.18 32.22C22.8733 32.22 22.6067 32.1067 22.38 31.88C22.1667 31.6533 22.06 31.3867 22.06 31.08C22.06 30.76 22.1667 30.4867 22.38 30.26C22.6067 30.0333 22.8733 29.92 23.18 29.92C23.5 29.92 23.7667 30.0333 23.98 30.26C24.2067 30.4867 24.32 30.76 24.32 31.08C24.32 31.3867 24.2067 31.6533 23.98 31.88C23.7667 32.1067 23.5 32.22 23.18 32.22Z" fill="black"/>
+</svg>
--- a/resources/images/cali_page_caption_prev.svg
+++ b/resources/images/cali_page_caption_prev.svg
@ -0,0 +1,3 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.58579 18.5858C3.80474 19.3668 3.80474 20.6332 4.58579 21.4142L17.3137 34.1421C18.0948 34.9232 19.3611 34.9232 20.1421 34.1421C20.9232 33.3611 20.9232 32.0948 20.1421 31.3137L8.82843 20L20.1421 8.68629C20.9232 7.90524 20.9232 6.63891 20.1421 5.85786C19.3611 5.07682 18.0948 5.07682 17.3137 5.85786L4.58579 18.5858ZM34.5 18H6V22H34.5V18Z" fill="#262E30"/>
+</svg>
--- a/resources/images/cali_page_caption_prev_hover.svg
+++ b/resources/images/cali_page_caption_prev_hover.svg
@ -0,0 +1,3 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.58579 18.5858C3.80474 19.3668 3.80474 20.6332 4.58579 21.4142L17.3137 34.1421C18.0948 34.9232 19.3611 34.9232 20.1421 34.1421C20.9232 33.3611 20.9232 32.0948 20.1421 31.3137L8.82843 20L20.1421 8.68629C20.9232 7.90524 20.9232 6.63891 20.1421 5.85786C19.3611 5.07682 18.0948 5.07682 17.3137 5.85786L4.58579 18.5858ZM34.5 18H6V22H34.5V18Z" fill="#262E30"/>
+</svg>
--- a/resources/images/cali_page_flow_introduction.png
+++ b/resources/images/cali_page_flow_introduction.png
--- a/resources/images/cali_page_flow_introduction_CN.png
+++ b/resources/images/cali_page_flow_introduction_CN.png
--- a/resources/images/fd_calibration_auto.png
+++ b/resources/images/fd_calibration_auto.png
--- a/resources/images/fd_calibration_manual.png
+++ b/resources/images/fd_calibration_manual.png
--- a/resources/images/fd_calibration_manual_result.png
+++ b/resources/images/fd_calibration_manual_result.png
--- a/resources/images/fd_calibration_manual_result_CN.png
+++ b/resources/images/fd_calibration_manual_result_CN.png
--- a/resources/images/flow_rate_calibration_auto.png
+++ b/resources/images/flow_rate_calibration_auto.png
--- a/resources/images/flow_rate_calibration_coarse.png
+++ b/resources/images/flow_rate_calibration_coarse.png
--- a/resources/images/flow_rate_calibration_coarse_result.png
+++ b/resources/images/flow_rate_calibration_coarse_result.png
--- a/resources/images/flow_rate_calibration_coarse_result_CN.png
+++ b/resources/images/flow_rate_calibration_coarse_result_CN.png
--- a/resources/images/flow_rate_calibration_fine.png
+++ b/resources/images/flow_rate_calibration_fine.png
--- a/resources/images/flow_rate_calibration_fine_result.png
+++ b/resources/images/flow_rate_calibration_fine_result.png
--- a/resources/images/flow_rate_calibration_fine_result_CN.png
+++ b/resources/images/flow_rate_calibration_fine_result_CN.png
--- a/resources/images/im_all_plates_stats.svg
+++ b/resources/images/im_all_plates_stats.svg
@ -1,8 +1,8 @@
 <svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="60" height="60" fill="#E7E7E7"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20 11.4C19.6686 11.4 19.4 11.6686 19.4 12V19.4H16.6V12C16.6 10.1222 18.1222 8.6 20 8.6H40C41.8778 8.6 43.4 10.1222 43.4 12V19.4H40.6V12C40.6 11.6686 40.3314 11.4 40 11.4H20Z" fill="#009688"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.732 20.6V28.0667H33.932V20.6H36.732Z" fill="#009688"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M31.4 14.6V28.0667H28.6V14.6H31.4Z" fill="#009688"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.068 17.266V28.066H23.268V17.266H26.068Z" fill="#009688"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4 24.6V32C19.4 32.3314 19.6686 32.6 20 32.6H40C40.3314 32.6 40.6 32.3314 40.6 32V24.6H43.4V32C43.4 33.8778 41.8778 35.4 40 35.4H20C18.1223 35.4 16.6 33.8778 16.6 32V24.6H19.4Z" fill="#009688"/>
+<rect width="60" height="60" fill="none"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 11.4C19.6686 11.4 19.4 11.6686 19.4 12V19.4H16.6V12C16.6 10.1222 18.1222 8.6 20 8.6H40C41.8778 8.6 43.4 10.1222 43.4 12V19.4H40.6V12C40.6 11.6686 40.3314 11.4 40 11.4H20Z" fill="#00AE42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.732 20.6V28.0667H33.932V20.6H36.732Z" fill="#00AE42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.4 14.6V28.0667H28.6V14.6H31.4Z" fill="#00AE42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.068 17.266V28.066H23.268V17.266H26.068Z" fill="#00AE42"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4 24.6V32C19.4 32.3314 19.6686 32.6 20 32.6H40C40.3314 32.6 40.6 32.3314 40.6 32V24.6H43.4V32C43.4 33.8778 41.8778 35.4 40 35.4H20C18.1223 35.4 16.6 33.8778 16.6 32V24.6H19.4Z" fill="#00AE42"/>
 </svg>
--- a/resources/images/im_all_plates_stats_transparent.svg
+++ b/resources/images/im_all_plates_stats_transparent.svg
@ -1,5 +1,5 @@
 <svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="60" height="60" fill="#E7E7E7"/>
+<rect width="60" height="60" fill="none"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M20 11.4C19.6686 11.4 19.4 11.6686 19.4 12V19.4H16.6V12C16.6 10.1222 18.1222 8.6 20 8.6H40C41.8778 8.6 43.4 10.1222 43.4 12V19.4H40.6V12C40.6 11.6686 40.3314 11.4 40 11.4H20Z" fill="#C8EBD5"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.732 20.6V28.0667H33.932V20.6H36.732Z" fill="#C8EBD5"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M31.4 14.6V28.0667H28.6V14.6H31.4Z" fill="#C8EBD5"/>
--- a/resources/images/max_volumetric_speed_calibration.png
+++ b/resources/images/max_volumetric_speed_calibration.png
--- a/resources/images/temperature_calibration.png
+++ b/resources/images/temperature_calibration.png
--- a/resources/images/temperature_record.png
+++ b/resources/images/temperature_record.png
--- a/resources/model/3DBenchy.stl
+++ b/resources/model/3DBenchy.stl
--- a/resources/model/Bambu_Cube.stl
+++ b/resources/model/Bambu_Cube.stl
--- a/resources/model/Bambu_Cube_V2.stl
+++ b/resources/model/Bambu_Cube_V2.stl
--- a/resources/model/ksr_FDMTest.stl
+++ b/resources/model/ksr_FDMTest.stl
--- a/resources/printers/filaments_blacklist.json
+++ b/resources/printers/filaments_blacklist.json
@ -6,55 +6,55 @@
      "vendor": "Third Party",
      "type": "TPU",
      "action": "prohibition",
-      "description": "TPU is not supported by AMS."
+      "description": "TPU: not supported"
    },
-	{
+    {
      "vendor": "Bambulab",
      "type": "TPU",
      "action": "prohibition",
-      "description": "TPU is not supported by AMS."
+      "description": "TPU: not supported"
    },
    {
      "vendor": "Third Party",
      "type": "PVA",
-	  "action": "warning",
-      "description": "Damp PVA will become flexible and get stuck inside AMS,please take care to dry it before use."
+      "action": "warning",
+      "description": "PVA: flexible"
    },
-	{
+    {
      "vendor": "Third Party",
      "type": "PLA-CF",
      "action": "warning",
-      "description": "CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution."
+      "description": "CF/GF: hard and brittle"
    },
-	{
+    {
      "vendor": "Third Party",
      "type": "PETG-CF",
      "action": "warning",
-      "description": "CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution."
+      "description": "CF/GF: hard and brittle"
    },
    {
      "vendor": "Third Party",
      "type": "PA-CF",
      "action": "warning",
-      "description": "CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution."
+      "description": "CF/GF: hard and brittle"
    },
-	{
+    {
      "vendor": "Third Party",
      "type": "PAHT-CF",
      "action": "warning",
-      "description": "CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution."
+      "description": "CF/GF: hard and brittle"
    },
-	{
+    {
      "vendor": "Bambulab",
      "type": "PET-CF",
      "action": "prohibition",
-      "description": "Bambu PET-CF/PA6-CF is not supported by AMS."
+      "description": "Bambu PET-CF/PA6-CF: not supported"
    },
-	{
+    {
      "vendor": "Bambulab",
      "type": "PA6-CF",
      "action": "prohibition",
-      "description": "Bambu PET-CF/PA6-CF is not supported by AMS."
+      "description": "Bambu PET-CF/PA6-CF: not supported"
    }
  ]
 }
--- a/resources/profiles/Anker.json
+++ b/resources/profiles/Anker.json
@ -1,6 +1,6 @@
 {
    "name": "Anker",
-    "version": "01.06.04.00",
+    "version": "01.07.00.02",
    "force_update": "0",
    "description": "Anker configurations",
    "machine_model_list": [
@ -60,77 +60,77 @@
            "name": "fdm_filament_common",
            "sub_path": "filament/fdm_filament_common.json"
        },
-        {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
-        },
-        {
-            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_tpu.json"
-        },
-        {
-            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_pet.json"
-        },
        {
            "name": "fdm_filament_abs",
            "sub_path": "filament/fdm_filament_abs.json"
        },
-        {
-            "name": "fdm_filament_pc",
-            "sub_path": "filament/fdm_filament_pc.json"
-        },
        {
            "name": "fdm_filament_asa",
            "sub_path": "filament/fdm_filament_asa.json"
        },
-        {
-            "name": "fdm_filament_pva",
-            "sub_path": "filament/fdm_filament_pva.json"
-        },
        {
            "name": "fdm_filament_pa",
            "sub_path": "filament/fdm_filament_pa.json"
        },
        {
-            "name": "Anker Generic PLA",
-            "sub_path": "filament/Anker Generic PLA.json"
+            "name": "fdm_filament_pc",
+            "sub_path": "filament/fdm_filament_pc.json"
        },
        {
-            "name": "Anker Generic PLA-CF",
-            "sub_path": "filament/Anker Generic PLA-CF.json"
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
        },
        {
-            "name": "Anker Generic PETG",
-            "sub_path": "filament/Anker Generic PETG.json"
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
        },
        {
-            "name": "Anker Generic ABS",
-            "sub_path": "filament/Anker Generic ABS.json"
+            "name": "fdm_filament_pva",
+            "sub_path": "filament/fdm_filament_pva.json"
        },
        {
-            "name": "Anker Generic TPU",
-            "sub_path": "filament/Anker Generic TPU.json"
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
        },
        {
-            "name": "Anker Generic ASA",
-            "sub_path": "filament/Anker Generic ASA.json"
+            "name": "Generic ABS @Anker",
+            "sub_path": "filament/Generic ABS @Anker.json"
        },
        {
-            "name": "Anker Generic PC",
-            "sub_path": "filament/Anker Generic PC.json"
+            "name": "Generic ASA @Anker",
+            "sub_path": "filament/Generic ASA @Anker.json"
        },
        {
-            "name": "Anker Generic PVA",
-            "sub_path": "filament/Anker Generic PVA.json"
+            "name": "Generic PA @Anker",
+            "sub_path": "filament/Generic PA @Anker.json"
        },
        {
-            "name": "Anker Generic PA",
-            "sub_path": "filament/Anker Generic PA.json"
+            "name": "Generic PA-CF @Anker",
+            "sub_path": "filament/Generic PA-CF @Anker.json"
        },
        {
-            "name": "Anker Generic PA-CF",
-            "sub_path": "filament/Anker Generic PA-CF.json"
+            "name": "Generic PC @Anker",
+            "sub_path": "filament/Generic PC @Anker.json"
+        },
+        {
+            "name": "Generic PETG @Anker",
+            "sub_path": "filament/Generic PETG @Anker.json"
+        },
+        {
+            "name": "Generic PLA @Anker",
+            "sub_path": "filament/Generic PLA @Anker.json"
+        },
+        {
+            "name": "Generic PLA-CF @Anker",
+            "sub_path": "filament/Generic PLA-CF @Anker.json"
+        },
+        {
+            "name": "Generic PVA @Anker",
+            "sub_path": "filament/Generic PVA @Anker.json"
+        },
+        {
+            "name": "Generic TPU @Anker",
+            "sub_path": "filament/Generic TPU @Anker.json"
        }
    ],
    "machine_list": [
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -0,0 +1,19 @@
+{
+    "type": "filament",
+    "filament_id": "GFB99",
+    "setting_id": "GFSB99_Anker_00",
+    "name": "Generic ABS @Anker",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.926"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Anker M5 0.4 nozzle",
+        "Anker M5C 0.4 nozzle"
+    ]
+}
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -0,0 +1,19 @@
+{
+    "type": "filament",
+    "filament_id": "GFB98",
+    "setting_id": "GFSB98_Anker_00",
+    "name": "Generic ASA @Anker",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_asa",
+    "filament_flow_ratio": [
+        "0.93"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Anker M5 0.4 nozzle",
+        "Anker M5C 0.4 nozzle"
+    ]
+}
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -0,0 +1,21 @@
+{
+    "type": "filament",
+    "filament_id": "GFN99",
+    "setting_id": "GFSN99_Anker_00",
+    "name": "Generic PA @Anker",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pa",
+    "nozzle_temperature_initial_layer": [
+        "280"
+    ],
+    "nozzle_temperature": [
+        "280"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Anker M5C 0.4 nozzle"
+    ]
+}
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -0,0 +1,21 @@
+{
+    "type": "filament",
+    "filament_id": "GFN98",
+    "setting_id": "GFSN98_Anker_00",
+    "name": "Generic PA-CF @Anker",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pa",
+    "filament_type": [
+        "PA-CF"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "280"
+    ],
+    "nozzle_temperature": [
+        "280"
+    ],
+    "compatible_printers": [
+        "Anker M5C 0.4 nozzle"
+    ]
+}
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -0,0 +1,18 @@
+{
+    "type": "filament",
+    "filament_id": "GFC99",
+    "setting_id": "GFSC99_Anker_00",
+    "name": "Generic PC @Anker",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pc",
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "filament_flow_ratio": [
+        "0.94"
+    ],
+    "compatible_printers": [
+        "Anker M5C 0.4 nozzle"
+    ]
+}
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -1,8 +1,8 @@
 {
    "type": "filament",
    "filament_id": "GFG99",
-    "setting_id": "GFSA04",
-    "name": "Voron Generic PETG",
+    "setting_id": "GFSG99_Anker_00",
+    "name": "Generic PETG @Anker",
    "from": "system",
    "instantiation": "true",
    "inherits": "fdm_filament_pet",
@ -39,16 +39,8 @@
    "filament_max_volumetric_speed": [
        "10"
    ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
    "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
+        "Anker M5 0.4 nozzle",
+        "Anker M5C 0.4 nozzle"
    ]
 }
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -0,0 +1,19 @@
+{
+    "type": "filament",
+    "filament_id": "GFL99",
+    "setting_id": "GFSL99_Anker_00",
+    "name": "Generic PLA @Anker",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_flow_ratio": [
+        "1.00"
+    ],
+    "filament_max_volumetric_speed": [
+        "17"
+    ],
+    "compatible_printers": [
+        "Anker M5 0.4 nozzle",
+        "Anker M5C 0.4 nozzle"
+    ]
+}
--- a/resources/profiles/Anycubic/filament/Anycubic
+++ b/resources/profiles/Anycubic/filament/Anycubic
@ -1,8 +1,8 @@
 {
    "type": "filament",
    "filament_id": "GFL98",
-    "setting_id": "GFSA04",
-    "name": "Anycubic Generic PLA-CF",
+    "setting_id": "GFSL98_Anker_00",
+    "name": "Generic PLA-CF @Anker",
    "from": "system",
    "instantiation": "true",
    "inherits": "fdm_filament_pla",
@ -19,13 +19,7 @@
        "7"
    ],
    "compatible_printers": [
-		"Anycubic i3 Mega S 0.4 nozzle",
-		"Anycubic Chiron 0.4 nozzle",
-		"Anycubic Vyper 0.4 nozzle",
-		"Anycubic Kobra Max 0.4 nozzle",
-        "Anycubic Kobra Plus 0.4 nozzle",
-		"Anycubic 4Max Pro 0.4 nozzle",
-		"Anycubic 4Max Pro 2 0.4 nozzle",
-        "Anycubic Kobra 2 0.4 nozzle"
+        "Anker M5 0.4 nozzle",
+        "Anker M5C 0.4 nozzle"
    ]
-}
+}
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -1,8 +1,8 @@
 {
    "type": "filament",
    "filament_id": "GFS99",
-    "setting_id": "GFSA04",
-    "name": "Voron Generic PVA",
+    "setting_id": "GFSS99_Anker_00",
+    "name": "Generic PVA @Anker",
    "from": "system",
    "instantiation": "true",
    "inherits": "fdm_filament_pva",
@ -19,12 +19,7 @@
        "10"
    ],
    "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
+        "Anker M5 0.4 nozzle",
+        "Anker M5C 0.4 nozzle"
    ]
 }
--- a/resources/profiles/Anker/filament/Generic
+++ b/resources/profiles/Anker/filament/Generic
@ -0,0 +1,16 @@
+{
+    "type": "filament",
+    "filament_id": "GFU99",
+    "setting_id": "GFSU99_Anker_00",
+    "name": "Generic TPU @Anker",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_tpu",
+    "filament_max_volumetric_speed": [
+        "3.2"
+    ],
+    "compatible_printers": [
+        "Anker M5 0.4 nozzle",
+        "Anker M5C 0.4 nozzle"
+    ]
+}
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@ -1,6 +1,6 @@
 {
    "type": "machine",
-    "setting_id": "GM003",
+    "setting_id": "GM_Anker_000",
    "name": "Anker M5 0.4 nozzle",
    "from": "system",
    "instantiation": "true",
@ -8,7 +8,7 @@
    "printer_model": "Anker M5",
    "default_print_profile": "0.20mm Standard @Anker",
    "default_filament_profile": [
-        "Anker Generic PLA"
+        "Generic PLA @Anker.json"
    ],
    "nozzle_diameter": [
        "0.4"
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@ -8,5 +8,5 @@
    "bed_model": "M5-CE-bed.stl",
    "bed_texture": "M5-CE-texture.svg",
    "hotend_model": "",
-    "default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PVA"
+    "default_materials": "Generic ABS @Anker;Generic PLA @Anker;Generic PLA-CF @Anker;Generic PETG @Anker;Generic TPU @Anker;Generic ASA @Anker;Generic PC @Anker;Generic PVA @Anker;"
 }
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@ -8,7 +8,7 @@
    "printer_model": "Anker M5C",
    "default_print_profile": "0.20mm Standard @Anker",
    "default_filament_profile": [
-        "Anker Generic PLA"
+        "Generic PLA @Anker.json"
    ],
    "nozzle_diameter": [
        "0.4"
--- a/Show more
+++ b/Show more