SoftFever
2a478ab4f9
post changes after merging BS1.7.4
...
Remove tracking etc..
2023-08-26 18:45:43 +08:00
SoftFever
e65b11a831
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
SoftFever
37c54aa4f6
clean up
2023-08-09 13:42:41 +08:00
chunmao.guo
031a678ea0
FIX: ModelMetadata is zipped without subpath, not substract it
...
Change-Id: I5af608b1aa312bfab79bbdea09e99f8b4b2de5de
2023-07-13 10:35:05 +08:00
chunmao.guo
02f2e51c2e
FIX: pass error from gstreamer to wxMediaCtrl
...
Change-Id: If275d0ebeb7089f67ad366811dc48009b86af564
2023-07-13 10:35:05 +08:00
chunmao.guo
fefd13a4ac
FIX: big thumbnail send by multi-frame
...
Change-Id: Ia3a88fb53b8cc27d20fa976822c91c09b4442d71
2023-07-13 10:35:05 +08:00
chunmao.guo
a4b3a5c000
FIX: [STUDIO-3571] not skip auxiliary for send gcode
...
Change-Id: I2dd1e36c571261c93ac899db5bbd3ad38fc40bc9
2023-07-07 17:52:43 +08:00
chunmao.guo
d164cd0265
FIX: special char # in printer file name
...
Change-Id: If9553108acc4b84c9d8824c995d3b0f607da7687
2023-07-07 17:29:08 +08:00
chunmao.guo
f96e60a14a
FIX: [STUDIO-3254] deselect all files when changing list type
...
Change-Id: I6904653093bcf72c4df8f98877e2bbd7f3cf4ae9
2023-07-07 17:29:08 +08:00
chunmao.guo
fba2431f91
FIX: cycle request when ModelThumbnail failed
...
Change-Id: Id3faa194b9cc5b8a7d54007fd7d15dd9d054955f
2023-07-07 17:29:08 +08:00
chunmao.guo
ac4f641222
FIX: media error message
...
Change-Id: I6fb9879b03fee6fab3b0aa2123cfe67c9b5916dc
2023-07-07 17:29:08 +08:00
chunmao.guo
10988f0bae
FIX: [STUDIO-3090] export error string to file panel
...
Change-Id: Ifabff9646dfcf19da9188edfb2447b33c8c1089e
2023-07-07 17:29:08 +08:00
chunmao.guo
75545c65cd
FIX: [STUDIO-3057] keep download state in file
...
Change-Id: I6685f014e9c6fe3bf2e33218cec68d188f8cbc72
2023-07-07 17:29:08 +08:00
chunmao.guo
9b0dbeb19d
FIX: [STUDIO-2969] model file thumbnail error continue
...
Change-Id: I0eab0cd0e85dd1c3dcc07eaed855682546ba4e04
2023-07-07 17:29:08 +08:00
chunmao.guo
e3d4380244
FIX: retry fetch file thumbnail one by one and split reply
...
Change-Id: I0c532bb57997ac61ff12172478459fc13f34f01c
2023-07-07 17:29:08 +08:00
chunmao.guo
ddd2c544c8
FIX: add load model process dialog
...
Change-Id: I3cf9f5a535236f87425a0314bde283e4549ca5e7
2023-07-07 17:25:51 +08:00
chunmao.guo
e48170e7fe
FIX: [STUDIO-2964] something with fix printer file management
...
Change-Id: Id8c2349766c8ca3f90a0985873726a72f760da50
2023-07-07 17:25:51 +08:00
chunmao.guo
1f56efe5ea
FIX: printer file system debug log
...
Change-Id: Iac9520de0d844fe24e116b0b4f0491c560ff3c26
(cherry picked from commit c97f927110b9c96cc8d43f521f88ea0e77522ff7)
2023-07-07 17:25:51 +08:00
chunmao.guo
5a7aa74e62
ENH: printer compatible for tunnel protos
...
Change-Id: Ic409ad967da43ad696b75a6c97e90e1f70e7610d
2023-07-07 17:25:51 +08:00
chunmao.guo
c142c8a31e
FIX: [STUDIO-1868] not show wrong models with old printer firmware
...
Change-Id: Ifa08e2e18348827ab3577ae98c0cf553bd4028f0
2023-07-07 17:25:51 +08:00
chunmao.guo
8c1dce19d3
FIX: [STUDIO-1868] sdcard model files runnable
...
Change-Id: I3b644a5bbea5e936903f7308e3bf484e5203f92c
2023-07-07 17:25:51 +08:00
chunmao.guo
c58baa6b16
FIX: error log reduce
...
Change-Id: I836ba41eefb3a8c12a57a22d208ee7d60140e345
2023-07-07 17:25:51 +08:00
chunmao.guo
904b122878
ENH: [STUDIO-1868] fetch printer model files and parse
...
Change-Id: If8da0072be5856cc179da3e62a06982de0ce2ecb
2023-07-07 17:25:51 +08:00
chunmao.guo
e8387b97ac
ENH: [STUDIO-1868] update printer file system protocol
...
Change-Id: I22300fadcafc08042cbeac537d0d0e7f621db3d2
2023-07-07 17:25:51 +08:00
SoftFever
9f598046d1
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
chunmao.guo
ef1e4a132d
ENH: [STUDIO-2446] support select media files by group of month/year
...
Change-Id: I10d26e34405a13daa477be011e7353d79232b4b3
2023-04-17 15:39:02 +08:00
Stone Li
6827b41eb3
NEW: add track events for debugging network
...
Change-Id: I671f91b4af00277236ca71014f8d667109756d00
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
chunmao.guo
a401c0fa2e
FIX: [STUDIO-2340] [STUDIO-2297] handle linux gstreamer error
...
Change-Id: Iadc6dcb9d7a9f2c5d1ce9cf979bbbfbd0f805d19
2023-04-17 15:39:02 +08:00
SoftFever
81ca7720e9
change BambuStudio to OrcaSlicer
2023-03-10 19:26:01 +08:00
lane.wei
ad9eccc5f4
ENH: gstreamer: use gst_clock_get_time insteadof gst_element_get_current_time
...
gst_element_get_current_time is only available since gst 1.18
2023-02-02 16:53:45 +08:00
lane.wei
6b15afc7b6
ENH: refine the timestamp when using P1P
...
the timestamp of mjpeg is not accurate
we simulate one
Change-Id: I9198f1ba930994cc4f86e8d3a3c778539d04ccb3
2023-02-01 16:24:44 +08:00
lane.wei
8a81df98b5
ENH: add the liveview support of P1P
...
P1P uses Mjpeg instead of h264
Change-Id: I41c8a6b7c13ed027350939bea3d9cb74757c0b63
2023-01-28 16:18:05 +08:00
Joshua Wise
745076805e
gstbambusrc: improve compatibility with older GStreamer versions
2023-01-12 14:56:04 +08:00
Joshua Wise
43a7f88c6c
Add support for Bambu Lab X1 series live video stream on Linux.
...
wxWidgets on Linux uses GStreamer as its back-end for wxMediaCtrl, which
doesn't have a bambu: URI handler. On Windows, this is handled by a Windows
Media subsystem plugin, and on Mac, this is handled with a BambuPlayer
class. Luckily, the libBambuSource.so binary that is distributed with the
network plugin package already contains support for receiving h.264 data
from the network, and the API is the same as is used by the tiny
bambusource.exe binary on Windows; we glue this into a GStreamer source
plugin that registers a URI handler for bambu:.
To make this work, we make a few additional changes elsewhere. GStreamer
seems to have trouble rendering an Xv overlay onto a 32bpp X visual, but
Bambu Slicer seems to request a 32bpp visual for some background
transparency in the Notebook; it doesn't seem to use it in an interesting
way on Linux, though, so we remove that request for transparency to allow
Bambu Studio to render to a 24bpp visual. The media controller
infrastructure also makes a few assumptions about when sizing information
can be queried from a wxMediaCtrl backend that do not hold true on Linux; we
either fix those assumptions, or fake them out, as needed. We also make a
few changes needed to successfully compile C.
This has only been tested with the GStreamer backend for wxWidgets --
notably, not the GStreamer-play backend (these are, astonishingly, two
different things!). If you find that this seems not to work, consider
*un*installing the libgstreamer-plugins-bad1.0-dev package and then
rebuilding wxWidgets.
2023-01-12 14:56:04 +08:00
chunmao.guo
d480d526e1
FIX: [STUDIO-1584] Mediafile: fix batch delete not work
...
Change-Id: I48b5897afdaa324f80cd9d5dbcd858c86903ef06
2022-12-15 04:38:15 -05:00
chunmao.guo
64ae3c3a56
FIX: [STUDIO-1360] media file image scale on macOS
...
Change-Id: I2a25ff53b9beb08a90aca07adad7accc69b6d2ed
2022-12-15 04:38:15 -05:00
chunmao.guo
3f4136157e
FIX: [STUDIO-1358] Media file cancel waiting download
...
Change-Id: Iaaa0da90f57aeb0e8aaf1049589d4f1012fc6460
2022-12-15 04:38:15 -05:00
chunmao.guo
5f20d14476
FIX: retry thumbnail request after refresh file list
...
Change-Id: I013566743f21df6403fb6bcd835e9e13dd40ddef
2022-12-15 04:33:48 -05:00
chunmao.guo
55d6bbbe21
FIX: replace print file default image
...
Change-Id: I58ff7c02b725c38b9c898fd1d4d4c92bf61c4c24
2022-10-20 19:34:37 +08:00
chunmao.guo
48083f7c0c
FIX: use shellex to open file, avoid cmd window
...
Change-Id: I6ae868381003c85a319e9c3bad37b0bffc3dbdd7
2022-10-20 19:34:37 +08:00
chunmao.guo
76d021ceaf
FIX: optimize media file panel
...
1. disable select when no file
2. disable batch edit button when no selection
3. hide batch edit when no file
4. delete/play/open_folder for downloaded file
5. hide type panel
Change-Id: Ida00da366a8f59b2c5028ddcf87e197c20a21e44
2022-10-20 19:34:37 +08:00
chunmao.guo
37723752cd
ENH: optimize media file user interface
...
Change-Id: Ic16133fd366fcbf41dd0c9535907786754186857
2022-10-20 19:34:37 +08:00
chunmao.guo
66c5d39e28
FIX: update bambu source api
...
Change-Id: I1689733af6cd8778f017a732dd36ad91bff80ea8
(cherry picked from commit 40bc2c251e00d6d95289fdd9def11f9e1bd9202f)
2022-10-20 19:34:37 +08:00
chunmao.guo
633d14e711
FIX: crash when delete media file in PrinterFileSystem
...
Change-Id: I9783bbfc9c9979b6da662b917b6f5cf4db04aa69
2022-10-20 19:34:37 +08:00
chunmao.guo
35bb20b2cf
FIX: use thread stack to keep shared ref of PrinterFileSystem
...
Change-Id: I86dce263f43eb65074d4fec777cb08885505b7cf
(cherry picked from commit 1dbc32b2335c33831ac94a787c8e7ec7d898ccba)
2022-09-29 11:16:43 +08:00
chunmao.guo
6dc68c4c9e
FIX: optimize style of media file panel
...
Change-Id: I2e5319538adae84b9b0348874d7b468b0dbc2db1
2022-09-29 11:16:43 +08:00
chunmao.guo
b2b2bc2a9c
FIX: not keep restarting video on local error
...
Change-Id: I2f79208326f92931bec108a4609088788ceca998
2022-09-08 21:49:36 +08:00
chunmao.guo
63448d9126
FIX: modify ui styles in media file panel
...
Change-Id: I064858975fc39618339cf4fe0e577fa3d2e5085f
2022-09-08 21:49:36 +08:00
chunmao.guo
6b580d285c
FIX: some bugs with media files
...
Change-Id: Ia5e0710a2979ae338902042e520ba9210e3a557d
2022-09-02 13:16:54 +08:00
lane.wei
e9e4d75877
Update the codes to 01.01.00.10 for the formal release
...
1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ...
2022-07-22 20:35:34 +08:00
