SoftFever
a7729ca83f
Merge BS 1.7.7.89
...
# Conflicts:
# bbl/i18n/ko/BambuStudio_ko.po
# 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/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/ko/BambuStudio.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json
# src/OrcaSlicer.cpp
# src/libnest2d/include/libnest2d/selections/firstfit.hpp
# src/libslic3r/GCode/GCodeProcessor.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintConfig.cpp
# src/slic3r/GUI/CalibrationWizardPresetPage.cpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/PartPlate.hpp
# src/slic3r/GUI/ReleaseNote.cpp
# src/slic3r/GUI/Tab.cpp
# version.inc
2023-10-21 19:41:49 +08:00
tao wang
fa71b9600b
ENH:update text in auto refill
...
jira:[STUDIO-4344]
Change-Id: Ieb1f40e03fd4a266b768f8b97e28328858fe63cc
(cherry picked from commit 621d4319760cea15e224a9927768bb643b852139)
2023-10-10 14:19:23 +08:00
hu.wang
110079f77e
FIX:translation of chamber temperature
...
JIRA:STUDIO-4624
Change-Id: Ifacd32a901705b1ffc359657afb6de5356e60400
2023-10-10 14:19:23 +08:00
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
maosheng.wei
5060f1b123
FIX: Copywriting localization
...
Change-Id: I713aa24b306c3687dd4b30e829312bc15d03aadf
2023-07-07 17:52:43 +08:00
tao wang
3b7d31e689
ENH:show all fillments backups
...
Change-Id: I5c1aef99b600f30d0369997f5900ba633ad9b13b
2023-07-07 17:52:43 +08:00
tao wang
3aeb66174d
ENH:filter useless filament backups
...
Change-Id: Ib68a7169d2091c253b4b33457d827b3795e753cb
2023-07-07 17:29:08 +08:00
tao wang
c26961218a
ENH:optimize filament auto refill
...
Change-Id: I098ea5872061ba8c27e9240faa301db8fd3a1b82
2023-07-07 17:29:08 +08:00
tao wang
959de9d8af
ENH:optimize filtration backup
...
Change-Id: I578e5ad83ae798a41ff1139a566de66e0d097ee5
2023-07-07 17:29:08 +08:00
tao wang
0dbda47be1
FIX:update the message text of the filtration backup
...
Change-Id: I5c24cae4370f9a94154ed7eb408e8c65cb5c6a1e
2023-07-07 17:29:08 +08:00
tao wang
e1199884d8
ENH:optimize the color of text in dark mode
...
Change-Id: I458250cfa43115b882ea4362e0e5620d8c5f8fb8
2023-07-07 17:25:51 +08:00
maosheng.wei
befdbe3d2a
FIX: STUDIO-1394 Printing window UI display issue
...
Change-Id: I1ce71b6d0e3ae40ecc98137920fcfb015b97e606
2023-07-07 17:25:51 +08:00
tao wang
2d43ce4702
NEW:disable ams mapping when sending printing
...
Change-Id: Icf2c859151c8c5605e651426154ce6fa84269b87
2023-07-07 17:25:51 +08:00
tao wang
80d6479bee
NEW:support for filament backup and edit
...
Change-Id: Id0a83e56df75253046cc07d972e9ad156690bbe7
2023-07-07 17:25:51 +08:00
tao wang
9f8397b187
NEW:support transparent color display
...
Change-Id: I49e0e4c507121af7dad912a3a549348e7ade8eec
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
tao wang
9c402384ac
FIX:fixed move wrong pos when amsmapping window popup first time
...
Change-Id: I5a9830141ef897399097dc21e70bfddd5113bcff
2023-04-17 15:39:02 +08:00
liz.li
db3acf7d72
FIX: cannot click AmsMapping
...
Change-Id: Ie6e908ee263d2c072520cdc8d8228f740646c995
2023-04-17 15:39:02 +08:00
liz.li
a6be285843
FIX:textinput behavior on send dialog (STUDIO-2347)
...
Change-Id: Iec970de7cd2f85b835b64283089c41f52df1cfcc
2023-04-17 15:39:02 +08:00
tao wang
00e1c50947
NEW:AMS supports ams filament backup
...
Change-Id: I0bc84f52bcd88dbbc1b9614b15474433c748cc14
2023-04-17 15:39:02 +08:00
tao wang
a11cce7b26
ENH:optimize ams humidity display
...
Change-Id: Ied40225c6618d6961f5fd8c357bb227b512437ea
2023-04-17 15:39:02 +08:00
SoftFever
50793bb1fc
change color
2023-03-08 20:08:54 +08:00
tao wang
268dc00ee3
FIX:fixed opening amsmapping popup will crash on linux
...
Change-Id: If67668582656fbb8ec52b49c36eccf1805d82b2e
2023-02-24 17:44:15 +08:00
tao wang
9b59fb4cbc
FIX:FIXED AMSapping popip window will display all ams
...
Change-Id: I98fae37cca90f7348d026e91e1b785af958f2f46
2023-02-24 09:23:57 +08:00
tao wang
94e097cd05
FIX:optimize the size of amsmapping item
...
Change-Id: I791d897c327b51991b203a58fab957cbe74b1b44
2023-02-22 20:09:17 +08:00
chunmao.guo
a03dc779b6
FIX: [STUDIO-2186] hide PopupWindow on alt-tab
...
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf4
(cherry picked from commit 7ddaf5260df19c76fca82e525caca26e55732fa9)
2023-02-22 20:09:17 +08:00
战马
5f69f4c016
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
81dea77932
FIX: [STUDIO-2186] hide PopupWindow on alt-tab
...
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf3
2023-02-22 20:09:17 +08:00
tao wang
bb5c614b71
NEW:update the new ui layout of ams mapping window
...
Change-Id: I3a5efbba2400481b5edfcf9e22aab142bf30a4f8
2023-02-22 20:09:17 +08:00
tao wang
746d678df5
ENH:update description of humidity description
...
Change-Id: I1ae0d4aa9d2b43e4d41526e32e0df9260e8aa49b
2023-02-01 16:24:44 +08:00
tao wang
86490d4cef
FIX:Fixed some UI layout issues for monitor page
...
Change-Id: I91fc50b63ff79ef7e9b7df600325a619c6764a09
2023-02-01 16:24:44 +08:00
Stone Li
eed072eccf
NEW: add extrusion calibration
...
1. display factor of extrusion calibration
2. add progress to calibration extrusion
3. support ext spool
Change-Id: Ic124a0097f16e6287c09f5f133eea84eeefb4000
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang
e962bcfec9
ENH:add ams humidity tips and update new icon
...
Change-Id: I8f504fa911ef7a84ca8929af3c5d7c53d289761e
2023-02-01 16:24:44 +08:00
tao wang
4d8d4cb69c
ENH:wxStaticText set the default foreground colour
...
Change-Id: Ifb03554848bc869f8605fb10945e7681147204d5
2023-01-10 19:08:26 +08:00
tao wang
5139edb876
ENH:add a drop-down arrow to the amsmapping button
...
Change-Id: Idb39a4c8a0f9421bce91f11705f30687f2b2d0d9
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 wang
ceae5fb0ed
FIX:fixed the border of the material control is not clear on the mac
...
Change-Id: I732690728f0e954ca9cbd37b03d6cf1ebf58f9a0
2022-12-15 04:38:15 -05:00
tao wang
46dc96fddf
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
tao wang
06ac3f73a6
ENH:popup msg for user when printing with unknown filaments
...
Change-Id: Ic1dfa9d70e7bd5ed0e4220b718e261ecf4ef64a8
2022-12-15 04:38:15 -05:00
tao wang
fbb9dfc41a
FIX:amsmappingpop dialog adjustments on macos
...
Change-Id: Ideeb1b8536efeaf0fedefa0acf91c386a2c76b96
2022-09-08 21:49:36 +08:00
Stone Li
0ed5b956ae
NEW: add ams option when sending a printing job
...
Change-Id: If75b9da926c1d9a9e59f3e16b3d491a6e0bdb2e6
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
tao wang
db435bc704
FIX:fixed wxwidget assert(amsmappingpop)
...
Change-Id: Ie97e6c0bdea9af713eb7088311dfc3df97d74239
2022-09-02 13:16:54 +08:00
Stone Li
ea7aaf7a8d
FIX: seprate filament_type and display_filament_type
...
special case for "Support G" and "Support W"
Change-Id: I26f873083d6afb58fb10ebc9beef54fbf5e18320
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-08-05 16:11:42 +08:00
tao wang
1e857a6e23
FIX:fixed cant not display all text on mapping popup dialog
...
Change-Id: I309c54f7e7ee1e2ba20756a31e421e6dd5d57d1a
2022-08-05 16:11:42 +08:00
tao wang
74e92ac51d
FIX:amsmapping update layout and fixes some issues
...
Change-Id: I3d88a06d5a9ac084b7ec498f7d201dda38d00fe7
2022-08-05 16:11:42 +08:00
tao wang
7d576f1c6a
FIX:fixed material name cannot be displayed completely
...
Change-Id: I0b4a166c212add1041665574ea06a1a55eeceeb6
2022-08-05 16:11:42 +08:00
tao wang
4d59db23e4
FIX:fixed amsmapping button can not get click event on macos
...
Change-Id: I4816365a2857e3e40c805af0e94654a8684c155c
2022-07-23 16:21:55 +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
