SoftFever
b8172316b8
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
hu.wang
b7b875a62a
NEW:[STUDIO-4012] support prompt sound
...
support modifying whether to turn on prompt sound from the print option pop-up window
Change-Id: I3206bfcefc9292dd2a7acb7294addc901ad21d4d
(cherry picked from commit 77594f1aba7db2948dd9b8627d74f37ff8dbf07a)
2023-09-22 16:21:26 +08:00
SoftFever
37c54aa4f6
clean up
2023-08-09 13:42:41 +08:00
tao wang
ffbb7a8be5
FIX:fixed some dark mode issues
...
Change-Id: I778150853f02ea9d13705acca1041ef79f3747ef
2022-12-15 04:38:15 -05:00
Stone Li
db4067a9dc
ENH: adjust funtions for P1P
...
Change-Id: Id8ce17f6cae523f9e6a0ccd9903df6ebefda934e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Arthur
4419703f41
ENH: do not add L prefix to empty string
...
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
2022-12-15 04:38:15 -05:00
tao wang
6f4e80bbb6
NEW:added dark mode
...
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
tao.jin
e56c266edc
FIX: refine Warning dialog
...
Change-Id: I8169dd8bce0013a1acacd837871af2051f5cc3a5
2022-12-15 04:33:48 -05:00
Stone Li
22211f1b54
NEW: add more print option
...
1. add option of ai monitor
2. add option marker detection of buildplate
3. add auto recovery step loss
Change-Id: I8483105fed9699d1072b5ef0f08aeff30e6f610a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
tao.jin
6f01c4841d
ENH: zh-CN translation of recent commits
...
Change-Id: I83b9cf087f59a0137f7f00a3649df5d410cc2576
2022-09-29 11:16:43 +08:00
lane.wei
3b9801f147
NEW: add config file to store functional compatibility
...
Change-Id: I9831cef9d57642fe7709eef87e74a64e21857e18
2022-09-02 13:16:54 +08:00
Stone Li
7e56fdabe6
ENH: compatible with old BBL filament rfid info
...
Change-Id: I4f2d29c3a20d2b24d6fd637b969d4de3577c44e0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-08-08 22:19:42 +08:00
Stone Li
98b612bc2e
ENH: refine translations
...
Signed-off-by: Stone Li <stone.li@bambulab.com>
Change-Id: I352176fad29c0afc298bb5f9e591b4102521497e
2022-08-05 16:11:42 +08:00
Stone Li
efa80db8de
FIX: fix spell error of spaghetti
...
Change-Id: If36910fc76e5e6cbc6629d4f015fdef561ce1dea
2022-08-05 16:11:42 +08:00
Stone Li
506605041e
NEW: add first layer and spaghetti options
...
Change-Id: I6e2237a59a2e1fdb3a2f0432be3c7b22db944811
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 382652d8da84198bd51caa9d33331b53c5ac6721)
2022-08-05 16:11:42 +08:00
