SoftFever
35455e6533
Merge branch 'master-remote' into feature/merge_remote_1.3
...
# Conflicts:
# bbl/i18n/zh_cn/BambuStudio_zh_CN.po
# resources/i18n/zh_cn/BambuStudio.mo
# resources/profiles/Voron.json
# resources/profiles/Voron/filament/Voron Generic ABS.json
# resources/profiles/Voron/filament/Voron Generic ASA.json
# resources/profiles/Voron/filament/Voron Generic PA-CF.json
# resources/profiles/Voron/filament/Voron Generic PA.json
# resources/profiles/Voron/filament/Voron Generic PC.json
# resources/profiles/Voron/filament/Voron Generic PETG.json
# resources/profiles/Voron/filament/Voron Generic PLA-CF.json
# resources/profiles/Voron/filament/Voron Generic PLA.json
# resources/profiles/Voron/filament/Voron Generic PVA.json
# resources/profiles/Voron/filament/Voron Generic TPU.json
# resources/profiles/Voron/filament/fdm_filament_abs.json
# resources/profiles/Voron/filament/fdm_filament_asa.json
# resources/profiles/Voron/filament/fdm_filament_common.json
# resources/profiles/Voron/filament/fdm_filament_pa.json
# resources/profiles/Voron/filament/fdm_filament_pc.json
# resources/profiles/Voron/filament/fdm_filament_pet.json
# resources/profiles/Voron/filament/fdm_filament_pla.json
# resources/profiles/Voron/filament/fdm_filament_pva.json
# resources/profiles/Voron/filament/fdm_filament_tpu.json
# resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
# resources/profiles/Voron/machine/Voron 0.1.json
# resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
# resources/profiles/Voron/machine/Voron 2.4 250.json
# resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
# resources/profiles/Voron/machine/Voron 2.4 300.json
# resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
# resources/profiles/Voron/machine/Voron 2.4 350.json
# resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
# resources/profiles/Voron/machine/Voron Trident 250.json
# resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
# resources/profiles/Voron/machine/Voron Trident 300.json
# resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
# resources/profiles/Voron/machine/Voron Trident 350.json
# resources/profiles/Voron/machine/fdm_klipper_common.json
# resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
# resources/profiles/Voron/process/0.12mm Fine @Voron.json
# resources/profiles/Voron/process/0.15mm Optimal @Voron.json
# resources/profiles/Voron/process/0.20mm Standard @Voron.json
# resources/profiles/Voron/process/0.24mm Draft @Voron.json
# resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
# resources/profiles/Voron/process/fdm_process_voron_common.json
# src/libslic3r/Preset.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/Field.cpp
# src/slic3r/GUI/GLToolbar.cpp
# src/slic3r/GUI/GLToolbar.hpp
# src/slic3r/GUI/MainFrame.cpp
# src/slic3r/GUI/MainFrame.hpp
# src/slic3r/GUI/NotificationManager.cpp
# src/slic3r/GUI/PhysicalPrinterDialog.cpp
# src/slic3r/GUI/PhysicalPrinterDialog.hpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/Plater.hpp
# src/slic3r/GUI/PrintHostDialogs.cpp
# src/slic3r/GUI/PrintHostDialogs.hpp
# src/slic3r/Utils/PrintHost.cpp
2022-10-20 23:12:00 +08:00
tao.jin
a84cf46699
ENH: refine UI of sending 3rd-party printer task
...
Change-Id: I47cd1682a495eb7aa6f230dfa41ee4f5c321fc72
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
SoftFever
e131938cac
wip
2022-10-16 16:39:45 +08:00
SoftFever
764b7d62a0
Merge mainstream changes
2022-10-04 13:51:34 +08:00
chunmao.guo
d41e0db18f
ENH: icon for param group
...
Change-Id: I435830615747aa850ed82621349f5fedfc29d860
2022-09-29 11:16:43 +08:00
SoftFever
488b1cd8f5
Support upload g-code to third-party printers
...
* wip
* fix cmake warning
* add UI and config options for Moonraker connection
* wip: copy whole print host UI from PS
* add more needed options
* wip 2
* fix string issue on Mac
* wip3
* fix cmake warning
* working
need tweaks
* cleanup
* support thumbnail
* fix DNS resolving issue in Windows
* code clean up
2022-08-20 23:06:41 +08:00
SoftFever
82127a92c9
Revert "Support upload g-code to third-party printers ( #2 )"
...
This reverts commit dc5e0eed34
2022-08-20 23:05:25 +08:00
SoftFever
dc5e0eed34
Support upload g-code to third-party printers ( #2 )
...
* wip
* fix cmake warning
* add UI and config options for Moonraker connection
* wip: copy whole print host UI from PS
* add more needed options
* wip 2
* fix string issue on Mac
* wip3
2022-08-20 15:09:05 +08:00
Tao Wang
ae45af1688
FIX:show msgdialog when user selected timelapse_no_toolhead first time
...
Change-Id: I08307aae17ccc93ae4448016504f68ab9e67558b
(cherry picked from commit 41a9cd933b6c98b7b2fbeea3b3863e3bce56e27a)
2022-08-05 15:28:01 +08:00
lane.wei
1555904bef
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00
