SoftFever
6ce1bc664e
Merge branch 'v1.7.2-remote'
...
Signed-off-by: SoftFever <softfeverever@gmail.com >
# Conflicts:
# deps/ZLIB/ZLIB.cmake
# 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/ko/OrcaSlicer_ko.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/calib/PressureAdvance/pa_pattern.3mf
# resources/handy_models/Disc.stl
# 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/ko/BambuStudio.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/profiles/Anycubic.json
# resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json
# resources/profiles/BBL.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.4 nozzle.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C.json
# resources/profiles/BBL/filament/Bambu PA-CF @base.json
# resources/profiles/BBL/filament/Bambu PA6-CF @BBL X1C.json
# resources/profiles/BBL/filament/Bambu PA6-CF @base.json
# resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json
# resources/profiles/BBL/filament/Bambu Support W @BBL X1.json
# resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json
# resources/profiles/BBL/filament/Generic HIPS @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic HIPS @BBL X1C.json
# resources/profiles/BBL/filament/Generic PA-CF.json
# resources/profiles/BBL/filament/Generic PC.json
# resources/profiles/BBL/filament/Generic PETG-CF @BBL X1C.json
# resources/profiles/BBL/filament/Generic PLA @0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C.json
# resources/profiles/BBL/filament/Generic PLA-CF.json
# resources/profiles/BBL/filament/Generic PLA.json
# resources/profiles/BBL/filament/Generic TPU.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C.json
# resources/profiles/BBL/filament/Overture Matte PLA @base.json
# resources/profiles/BBL/filament/Overture PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture PLA @BBL P1P.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1C.json
# resources/profiles/BBL/filament/Overture PLA @base.json
# resources/profiles/BBL/filament/P1P/Bambu TPU 95A @BBL P1P.json
# resources/profiles/BBL/filament/P1P/Generic PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/P1P/Generic TPU @BBL P1P.json
# resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite ABS @base.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite ASA @base.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite PETG @base.json
# resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json
# resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
# resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
# resources/profiles/BBL/process/0.06mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.08mm Extra Fine @BBL P1P.json
# resources/profiles/BBL/process/0.08mm Extra Fine @BBL X1C.json
# resources/profiles/BBL/process/0.08mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.10mm Standard @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/process/0.10mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.12mm Fine @BBL P1P.json
# resources/profiles/BBL/process/0.12mm Fine @BBL X1C.json
# resources/profiles/BBL/process/0.12mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.14mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.16mm Optimal @BBL P1P.json
# resources/profiles/BBL/process/0.16mm Optimal @BBL X1C.json
# resources/profiles/BBL/process/0.18mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.20mm Standard @BBL P1P.json
# resources/profiles/BBL/process/0.20mm Standard @BBL X1C.json
# resources/profiles/BBL/process/0.20mm Strength @BBL P1P.json
# resources/profiles/BBL/process/0.20mm Strength @BBL X1C.json
# resources/profiles/BBL/process/0.24mm Draft @BBL P1P.json
# resources/profiles/BBL/process/0.24mm Draft @BBL X1C.json
# resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.28mm Extra Draft @BBL P1P.json
# resources/profiles/BBL/process/0.28mm Extra Draft @BBL X1C.json
# resources/profiles/BBL/process/0.30mm Standard @BBL P1P 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Standard @BBL X1 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Strength @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.32mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.36mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL P1P 0.8 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL X1 0.8 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.42mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.56mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/fdm_process_bbl_common.json
# resources/profiles/Creality.json
# resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.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-5 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json
# resources/profiles/Elegoo.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 2D 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.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 Plus 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json
# resources/profiles/Prusa.json
# resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json
# resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.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-Plus 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json
# resources/profiles/Tronxy.json
# resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json
# resources/profiles/Tronxy/process/0.08mm Extra Fine @Tronxy.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/Tronxy/process/0.28mm Extra Draft @Tronxy.json
# resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json
# resources/web/data/text.js
# src/OrcaSlicer.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/SeamPlacer.cpp
# src/libslic3r/GCode/SeamPlacer.hpp
# src/libslic3r/GCodeWriter.cpp
# src/libslic3r/GCodeWriter.hpp
# src/libslic3r/Preset.cpp
# src/libslic3r/PresetBundle.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/TreeSupport.cpp
# src/libslic3r/calib.cpp
# src/libslic3r/calib.hpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/BedShapeDialog.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/GUI_Factories.cpp
# src/slic3r/GUI/GUI_ObjectList.cpp
# src/slic3r/GUI/Jobs/ArrangeJob.cpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/PartPlate.hpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/StatusPanel.cpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Widgets/AMSControl.hpp
# version.inc
2023-09-29 19:46:49 +08:00
zhimin.zeng
15b607d98c
FIX: Adjust error information storage method
...
Jira: XXXX
Change-Id: If6564f6425678faa2df9b08d9c7642afb7ffbe50
2023-09-22 16:21:26 +08:00
zhimin.zeng
050fb3cbed
FIX: print by object not support timelapse for I3
...
Jira: XXXX
Change-Id: I8354971843f1e020db0f6407348cfa220ad514f2
2023-09-22 16:21:26 +08:00
tao wang
2246aa223d
ENH:synced some N1 codes
...
jira:[sync]
Change-Id: I94aed7f068e76cb28459ec77448c89f922134414
2023-09-22 16:21:26 +08:00
zhimin.zeng
a006b38446
FIX: revert "Disable i3 traditional timelapse"
...
Jira: XXXX
Change-Id: I5ab7ce8e39787149c16983607e2bd1330f4d6ea0
2023-09-22 16:21:26 +08:00
zhimin.zeng
fd7f28940a
ENH: Allow machines that do not support timelapse
...
STUDIO-3935
Change-Id: I8b65c1d24fdee744af10d4112b0f8bee7554ad3c
(cherry picked from commit 1802c2e8c4fc68fce3dc5b025814aec84e7653a3)
2023-09-22 16:21:26 +08:00
SoftFever
6e032175c5
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
tao wang
174ce11805
ENH:allow printing of all files in the SD card
...
Change-Id: I72097ddc1fa1020de2133753f14c0715322ea3cd
2023-07-07 17:52:43 +08:00
tao wang
2ea36b52fd
NEW:added missing method for github branch
...
Change-Id: I6dba035deb036a5610d3659a6abebbe9ae768bdc
2023-07-07 17:52:43 +08:00
tao wang
f33c0831e8
ENH:close the auto refresh window when sending tasks
...
STUDIO-3492
Change-Id: I9f1272a5d105e8fad379ca95820447d33eb49b1a
2023-07-07 17:52:43 +08:00
tao wang
671a84765a
ENH:optimized page layout
...
Change-Id: I44f2668b7a4c18bb1356bef3529a4a8f5024d88f
2023-07-07 17:52:43 +08:00
tao wang
975462dac0
ENH:filter useless filament backups
...
Change-Id: Ib68a7169d2091c253b4b33457d827b3795e753cb
2023-07-07 17:29:08 +08:00
Stone Li
d702ff4531
FIX: fix plate name encoding issue
...
Change-Id: Ia89b2c5bbb4519ed938ae23ff124719cfe6203de
Signed-off-by: Stone Li <stone.li@bambulab.com >
2023-07-07 17:29:08 +08:00
tao wang
55ca3830db
ENH:optimize filament auto refill
...
Change-Id: I098ea5872061ba8c27e9240faa301db8fd3a1b82
2023-07-07 17:29:08 +08:00
tao wang
877f246c00
ENH:add device selection on the calibration page
...
Change-Id: I16ed5a5f990a518ab2a195eea83289782fbe741f
2023-07-07 17:29:08 +08:00
tao wang
51ffb4ed72
ENH:filter characters not supported by windows system
...
Change-Id: I0dcbf9535df7bdc4b19e095aa0c23223efa5087b
2023-07-07 17:29:08 +08:00
Arthur
7f49cf24ae
ENH: turn off flow calibration on PEI plate by default
...
Flow calibration on PEI plate may fail. To reduce users' confusion, let it be off by default.
Change-Id: Ic31f18b5fd378ac8b20e4d1461ed3dbfbae1ae4b
(cherry picked from commit bc8b4cb082f20984207f44e63104be9a603a2332)
2023-07-07 17:29:08 +08:00
tao wang
d2d85d7a21
FIX:macos13 system display printer rename button
...
Change-Id: I56a492043690ee6ef320fee626f4a09c070119d9
2023-07-07 17:29:08 +08:00
tao wang
4986e94ac0
ENH:check 3mf files without gcode data
...
Change-Id: Ic056cd29d4bab8612701fd2291af5a14eb937bb7
2023-07-07 17:29:08 +08:00
tao wang
7ba5d0953e
ENH:enable flow calibration when using Textured PEI Plate
...
Change-Id: I34d5ae8a04f97eb4559b27a87f87a894650f6e39
2023-07-07 17:25:51 +08:00
tao wang
080b7cff05
FIX:fixed incorrect disabled state of filaments material
...
Change-Id: I168131d90f4b7e987d026808366a08895e1b1524
2023-07-07 17:25:51 +08:00
tao wang
7cb4239ac2
ENH:display error msg when connecting to the printer fails
...
Change-Id: I483d6c00bdd623e34bce5b087bfbcb9a5e876fa3
2023-07-07 17:25:51 +08:00
maosheng.wei
b22c8ea2f0
FIX: STUDIO-1394 Printing window UI display issue
...
Change-Id: I1ce71b6d0e3ae40ecc98137920fcfb015b97e606
2023-07-07 17:25:51 +08:00
tao wang
d746e914ab
NEW:support for sending print job from SD card view
...
Change-Id: I8366345ae4323c1b568bfd267d036e2474ff969a
2023-07-07 17:25:51 +08:00
tao wang
807efa4d5f
NEW:optimizing error info for network requests
...
Change-Id: I8656c2f899b086b5ab52d94b7186e64df1625e3e
2023-07-07 17:25:51 +08:00
tao wang
ccd5bbd61d
NEW:flow calibration is not supported when using Textured PEI Plate
...
Change-Id: Ib6a584cbfba762088472b55a09061af83a5a937a
2023-07-07 17:25:51 +08:00
SoftFever
91a4cfb422
Merge remote-tracking branch 'remote/master' into feature/merge_upstream
...
# Conflicts:
# bbl/i18n/OrcaSlicer.pot
# bbl/i18n/de/OrcaSlicer_de.po
# bbl/i18n/en/OrcaSlicer_en.po
# bbl/i18n/es/OrcaSlicer_es.po
# bbl/i18n/fr/OrcaSlicer_fr.po
# bbl/i18n/hu/OrcaSlicer_hu.po
# bbl/i18n/it/OrcaSlicer_it.po
# bbl/i18n/ja/OrcaSlicer_ja.po
# bbl/i18n/nl/OrcaSlicer_nl.po
# bbl/i18n/sv/OrcaSlicer_sv.po
# bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
# resources/config.json
# 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/OrcaSlicer.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/images/ams_humidity_2.svg
# resources/images/ams_humidity_3.svg
# resources/images/ams_humidity_4.svg
# resources/images/ams_humidity_tips.svg
# resources/images/monitor_state_on.svg
# resources/images/sdcard_state_normal.svg
# resources/profiles/BBL.json
# resources/profiles/BBL/filament/Bambu PETG-CF @base.json
# resources/profiles/BBL/filament/Generic PETG-CF @base.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
# resources/web/data/text.js
# resources/web/guide/3/index.html
# resources/web/guide/31/index.html
# src/BambuStudio.cpp
# src/libslic3r/AABBTreeLines.hpp
# src/libslic3r/Brim.cpp
# src/libslic3r/CMakeLists.txt
# src/libslic3r/ExPolygon.hpp
# src/libslic3r/Fill/FillBase.hpp
# src/libslic3r/Format/bbs_3mf.cpp
# src/libslic3r/GCodeWriter.cpp
# src/libslic3r/Line.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/Preset.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/TreeSupport.cpp
# src/slic3r/GUI/AmsMappingPopup.cpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/GCodeViewer.cpp
# src/slic3r/GUI/GCodeViewer.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/MainFrame.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/Preferences.cpp
# src/slic3r/GUI/SelectMachine.cpp
# src/slic3r/GUI/Widgets/AMSControl.cpp
# src/slic3r/GUI/wxMediaCtrl2.cpp
# src/slic3r/Utils/Process.cpp
# version.inc
2023-04-19 08:48:07 +08:00
tao wang
aa09a936a0
NEW:add network test entry when has network error
...
Change-Id: Ie315191e26148e520d3e8e3e4323fd619efb982a
2023-04-17 15:39:02 +08:00
tao wang
93ff04aacb
NEW:AMS supports ams filament backup
...
Change-Id: I0bc84f52bcd88dbbc1b9614b15474433c748cc14
2023-04-17 15:39:02 +08:00
tao wang
2324ee34d2
ENH:use high contrast icons in dark mode
...
fixed STUDIO-2033
Change-Id: Ibfbc40b02f5333d80d2875d88bb3029109256e4a
2023-04-17 15:39:02 +08:00
SoftFever
38d5ccb29f
Merge branch 'master-remote' into feature/1.5
...
Signed-off-by: SoftFever <softfeverever@gmail.com >
# Conflicts:
# bbl/i18n/BambuStudio.pot
# bbl/i18n/de/BambuStudio_de.po
# bbl/i18n/en/BambuStudio_en.po
# bbl/i18n/es/BambuStudio_es.po
# bbl/i18n/fr/BambuStudio_fr.po
# bbl/i18n/hu/BambuStudio_hu.po
# bbl/i18n/it/BambuStudio_it.po
# bbl/i18n/nl/BambuStudio_nl.po
# bbl/i18n/sv/BambuStudio_sv.po
# bbl/i18n/zh_cn/BambuStudio_zh_CN.po
# deps/Boost/Boost.cmake
# deps/wxWidgets/wxWidgets.cmake
# resources/config.json
# 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/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/images/tips_arrow.svg
# resources/profiles/Anycubic.json
# resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
# resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
# resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
# resources/profiles/Anycubic/filament/Anycubic Generic PA.json
# resources/profiles/Anycubic/filament/Anycubic Generic PC.json
# resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
# resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
# resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
# resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
# resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
# resources/profiles/Anycubic/filament/fdm_filament_common.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
# resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
# resources/profiles/Anycubic/process/fdm_process_common.json
# resources/profiles/BBL.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
# resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
# resources/profiles/Voron.json
# resources/web/data/text.js
# resources/web/image/printer/Anycubic 4Max Pro_cover.png
# src/BambuStudio.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode.hpp
# src/libslic3r/GCode/GCodeProcessor.cpp
# src/libslic3r/GCodeWriter.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/PresetBundle.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/slic3r/GUI/AMSMaterialsSetting.cpp
# src/slic3r/GUI/AMSMaterialsSetting.hpp
# src/slic3r/GUI/AmsMappingPopup.cpp
# src/slic3r/GUI/AmsMappingPopup.hpp
# src/slic3r/GUI/Auxiliary.cpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/DeviceManager.cpp
# src/slic3r/GUI/DeviceManager.hpp
# src/slic3r/GUI/ExtrusionCalibration.cpp
# src/slic3r/GUI/GCodeViewer.cpp
# src/slic3r/GUI/GCodeViewer.hpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/IMSlider.cpp
# src/slic3r/GUI/Jobs/PrintJob.cpp
# src/slic3r/GUI/Jobs/PrintJob.hpp
# src/slic3r/GUI/Jobs/SendJob.cpp
# src/slic3r/GUI/Jobs/SendJob.hpp
# src/slic3r/GUI/MainFrame.cpp
# src/slic3r/GUI/MainFrame.hpp
# src/slic3r/GUI/MediaPlayCtrl.cpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/PhysicalPrinterDialog.cpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/PrintHostDialogs.cpp
# src/slic3r/GUI/Printer/BambuTunnel.h
# src/slic3r/GUI/Printer/PrinterFileSystem.cpp
# src/slic3r/GUI/Printer/gstbambusrc.c
# src/slic3r/GUI/Printer/gstbambusrc.h
# src/slic3r/GUI/ReleaseNote.cpp
# src/slic3r/GUI/ReleaseNote.hpp
# src/slic3r/GUI/SelectMachine.cpp
# src/slic3r/GUI/SendToPrinter.cpp
# src/slic3r/GUI/SetBedTypeDialog.cpp
# src/slic3r/GUI/StatusPanel.cpp
# src/slic3r/GUI/StatusPanel.hpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Widgets/AMSControl.cpp
# src/slic3r/GUI/Widgets/AMSControl.hpp
# src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
# src/slic3r/GUI/Widgets/Label.cpp
# src/slic3r/GUI/WipeTowerDialog.cpp
# src/slic3r/Utils/Process.cpp
# src/slic3r/Utils/bambu_networking.hpp
# version.inc
2023-03-08 00:08:26 +08:00
chunmao.guo
36ebb17890
FIX: [STUDIO-2186] hide PopupWindow on alt-tab
...
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf4
(cherry picked from commit 7ddaf5260df19c76fca82e525caca26e55732fa9)
2023-02-22 20:09:17 +08:00
战马
8ce94fb961
FIX: Revert "[STUDIO-2186] hide PopupWindow on alt-tab"
...
This reverts commit 3b8c11659a6cf3062ad27772348b84be5001a4f6.
Reason for revert: update pick
Change-Id: Id991af5b4a5950ee76ecf59176eabc72c885db88
2023-02-22 20:09:17 +08:00
chunmao.guo
9d6523de96
FIX: [STUDIO-2186] hide PopupWindow on alt-tab
...
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf3
2023-02-22 20:09:17 +08:00
tao wang
2f10d3683a
ENH:add network verification process for LAN printing
...
Change-Id: I0a9e9fa5e9746f5ceb989b00c6b44e812d071132
2023-02-22 20:09:17 +08:00
Stone Li
6838fe87ee
ENH: add tips for P1P when printing all is not supported
...
Change-Id: I5caa5dbc2d9cd3c57318a2366c8a8ef494d4df31
Signed-off-by: Stone Li <stone.li@bambulab.com >
2023-02-01 16:24:44 +08:00
SoftFever
9f91a8450b
merge upstream changes
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com >
2023-01-21 00:37:10 +08:00
SoftFever
ab1d613f42
change app color
2023-01-03 22:05:20 +08:00
Stone Li
9a6464e038
ENH: valid print all when selecting blank plate
...
and give a tips when print blank plate
Change-Id: Ic243dcee87d4a5a09de91c5806f1a94735f1052b
Signed-off-by: Stone Li <stone.li@bambulab.com >
2022-12-15 04:38:15 -05:00
tao wang
61e3ce835f
FIX:fixed some issue with send print and ams ui
...
Change-Id: I1a37bad6ec1f193f9fd98c74506b3bb0358ece6d
2022-12-15 04:38:15 -05:00
tao wang
284d309706
ENH:blocking send/send all on p1p printers
...
Change-Id: If6ed8056790211d6ffa8237136318768e1a7f5d7
2022-12-15 04:38:15 -05:00
Stone Li
8b0ed2ece6
ENH: can not send print job when the consistency upgrade is required
...
Change-Id: I7a0c974d3dcfe54fd271e234513489cc0dd358d0
Signed-off-by: Stone Li <stone.li@bambulab.com >
2022-12-15 04:38:15 -05:00
tao wang
fc8b8bcffe
NEW:lan mode interaction optimization
...
Change-Id: I80eef918fe1ac4c8e306787bd7b9437262686e23
2022-12-15 04:38:15 -05:00
Stone Li
ac8e9cebbe
NEW: add warnings when sending print job
...
tpu can not be used with ams
Change-Id: Icf93b0daed017eb1b378daba00b754bbf18ad354
Signed-off-by: Stone Li <stone.li@bambulab.com >
2022-12-15 04:38:15 -05:00
tao wang
c786b42868
ENH:losing focus when renaming is automatically saved
...
Change-Id: I411e824e4b7154aa85e14d1c0aae3ddf979bd259
2022-12-15 04:38:15 -05:00
tao.jin
ef355525ad
ENH: rebuild warning dialog with frame
...
Change-Id: Id4a8ab80ecec30b668de59556823dad6838276fe
2022-12-15 04:38:15 -05:00
Stone Li
83b6feb394
ENH: can not send print task when printer need force upgrading
...
Change-Id: I3be5c9c54b3a5fb448b1e96901df8aa7ffbffbd8
2022-12-15 04:38:15 -05:00
tao wang
a461654b38
NEW:added dark mode
...
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
zhimin.zeng
ebc16e7997
FIX: old gcode files don't show timelapse when send print
...
Change-Id: If1829c8848ab9874a55367cdf77f881be0645c10
(cherry picked from commit 95d456f4cc16840167b3e2beaee597208bc885b4)
2022-12-15 04:38:15 -05:00
tao wang
51182e7ec0
NEW:add some new changes for send print job
...
1. change tray id like to A1, B1, C1, D1
2. can change the name of the project that is sent
3. add ams mapping instructions
Change-Id: If301f4051f640157a53d6927a0ddf2facf4961b4
2022-12-15 04:38:15 -05:00
