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
maosheng.wei
fc64864b15
FIX: [STUDIO-2947] Privacy terms with white background and white text
...
Change-Id: I54fdef6300ef7ae0413796c5f685ef7499bb8ef4
2023-07-07 17:29:08 +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
7eb3aa8104
FIX: privacy dialog dark mode (STUDIO-2345)
...
Change-Id: Icd44d4b83bd9785869f68c04e6d4e38524e4b46a
2023-04-17 15:39:02 +08:00
SoftFever
5ef51f6c8a
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
tao.jin
240d106d58
NEW: check privacy update
...
Change-Id: I260fbc20cdddbdadd38f1470a2e7050ee1ed14cd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Heiko Liebscher
964f2163cb
fix_color_to_#009688 and hover btn ( #125 )
...
* fix_color_to_#009688 and hover btn
* fix_color_main_menu
* fix double ##
* tooltip_color
* fix bitmapcache.cpp
2023-01-06 21:22:20 +08:00
tao wang
c47f892ec8
FIX:release note support for richtext and markdown
...
Change-Id: Ie00dc94d88005c123acd20f05f43c5473b6dfa46
2022-09-29 11:16:43 +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
lane.wei
1555904bef
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00
SoftFever
SoftFever
maosheng.wei
chunmao.guo
tao.jin
Heiko Liebscher
tao wang
lane.wei