3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-19 23:01:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
21966 commits 10 branches 72 tags 3.3 GiB
Commit graph

165 commits

Author SHA1 Message Date
liz.li
1f54aaf22b NEW: add calibration 
Change-Id: I03e5489a67042e7f76f5a42260a289d540b5a63a
(cherry picked from commit cbac2c639db830eb779b1979c8d6b4eb3decb7e6)
 2023-07-07 17:25:51 +08:00
gerrit
1cde1ebaed ci: update network module based on commit ec16b83 
Change-Id: I306b66e265ef32fa83d2363797228752bb06f838
(cherry picked from commit 28061562c23a6f72a1414b26aeed062ecd454d62)
 2023-07-07 17:25:51 +08:00
liz.li
ab0c6611c8 NEW:add paint tool in assembly view 
Change-Id: I108e1e24ca9d033d2279c8153585166971a347a6
 2023-07-07 17:25:51 +08:00
tao wang
7af252fa99 NEW:support for sending print job from SD card view 
Change-Id: I8366345ae4323c1b568bfd267d036e2474ff969a
 2023-07-07 17:25:51 +08:00
chunmao.guo
8dae5b6980 ENH: [STUDIO-2759] network queue on main thread 
Change-Id: Ie1fa855b354047ab015c801cae5df7271e844e58
 2023-07-07 17:25:51 +08:00
tao wang
d70a608921 NEW:confirm privacy agreement before binding printer 
Change-Id: Iee6776bf533577dd9fd388c3ea2efad27692cf82
 2023-07-07 17:25:51 +08:00
tao wang
8b490adc51 NEW:optimizing error info for network requests 
Change-Id: I8656c2f899b086b5ab52d94b7186e64df1625e3e
 2023-07-07 17:25:51 +08:00
tao wang
a64e0b2f82 NEW:support the display of profile info in the mall model 
Change-Id: Idab6bb5a4ef50df665ab7c8e5891efc5a8253eba
 2023-07-07 17:25:51 +08:00
Stone Li
544102e04b ENH: update version to 01.06.00.51 
Change-Id: I01b5721e8b713b5e9f763898e3c9c3eaf6321b4e
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-07-07 17:25:51 +08:00
战马
0a9d33157a NEW: [STUDIO-2476] design_staffpick 
This reverts commit 4d13a44a2e4136d0c2e173e367e13f6a6ba00670.

Reason for revert: 123

Change-Id: I008a0ab3540589e5938fb3e1814571e00c467227
 2023-07-07 17:25:51 +08:00
SoftFever
bdf8c8d5b1 Merge remote-tracking branch 'remote/v1.6.0' 
# Conflicts:
#	.github/workflows/build_ubuntu.yml
#	src/libslic3r/Print.cpp
#	version.inc
 2023-07-07 00:38:54 +08:00
SoftFever
442c232323 Skip checking Repetier server name #1116 2023-05-24 00:27:29 +08:00
Scott Mudge
e23b600239
Fix build warnings, update deprecated boost headers (#1035) 
Fix build warnings, update deprecated boost headers.
 2023-05-11 23:46:15 +08:00
gerrit
48bdf6dbc7 ci: update network module based on commit 2f3f938 
Change-Id: I56ea8cf7a512e77d2c7e617fdff381d705399b5c
 2023-04-27 15:50:47 +08:00
Stone Li
1f42a95ee4 ENH: update version to 01.06.02.01 
Change-Id: I97fbdfb2f58638fd819fc4cec41333ee695547f8
 2023-04-27 15:50:47 +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
a344ebcf81 NEW: Revert "[STUDIO-2476] design_staffpick" 
This reverts commit 0063720bbaaa6a680f2d9f395d60cf193d126e11.

Change-Id: Ieb19daf19b38f5e25b78967ee225042988d98c7d
 2023-04-17 15:39:02 +08:00
gerrit
e2395744b1 ci: update network module based on commit 6a243cc 
Change-Id: Iab3750f3a7575093a72781fed861a1f3f41f1d1f
(cherry picked from commit ddc88c624b11eb0f66064a54e7c9cc50546ef6eb)
 2023-04-17 15:39:02 +08:00
gerrit
483fc9f147 ci: update network module based on commit be95fa8 
Change-Id: I3ba0ac192eb9ee9e6fe1e1deff2d18c770ae63a3
(cherry picked from commit a38f0804ab1fa1131e7955f4c13c27972d36b93e)
 2023-04-17 15:39:02 +08:00
lane.wei
7595775ba5 ENH: update: remove the old cached ota files in some corner case 
Change-Id: I8039e21045d33827dae096b18feead6150981056
(cherry picked from commit d920b3a57c284422e09c952b103c5f26ae551d2a)
 2023-04-17 15:39:02 +08:00
chunmao.guo
0ca3f27c54 ENH: [STUDIO-2550] config auto sync system presets 
Change-Id: I83f9baae5793b214f4d1c040f5819ad9a03cd47f
(cherry picked from commit 40fe90e176fc001f54b22375ddb0dd035a6d84cd)
 2023-04-17 15:39:02 +08:00
chunmao.guo
84580f6f94 NEW: [STUDIO-2476] design_staffpick 
Change-Id: Ibe4d540ca31882e199437dc2811925e1a40680ec
 2023-04-17 15:39:02 +08:00
Stone Li
36e0cc0b12 ENH: optimize track logic 
Change-Id: I1fea7eb9681389924c32f3754fc77ee21a3ab898
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-04-17 15:39:02 +08:00
chunmao.guo
2573d3c112 FIX: [STUDIO-2509] open self for new window on mac 
Change-Id: I8fc5b810b00a089f35b914604c511201ae8e5d0b
 2023-04-17 15:39:02 +08:00
Stone Li
1f1e5894bb ENH: add sec_link field to start_bind 
Change-Id: Ia48592f096b14ea0fe4de20126287c6f885d73a5
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-04-17 15:39:02 +08:00
chunmao.guo
db65fd6e83 FIX: [STUDIO-1940] hide edit ctrl on scroll in ObjectList 
Change-Id: I9936ecff241d468f14e3dda0c12e4458cad8c237
 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
tao wang
311d9c3481 NEW:the model mall is opened using the default browser 
Change-Id: I9f855288486196b2a7c72c51bee8cfcf408ceab8
 2023-04-17 15:39:02 +08:00
SoftFever
1a281e99a6 Show help info of setting up connection 2023-04-03 20:02:55 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
81ca7720e9 change BambuStudio to OrcaSlicer 2023-03-10 19:26:01 +08:00
SoftFever
3a80173533 rename bambu-studio to orca-slicer 2023-03-10 18:53:25 +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
gerrit
5cdd515a9b ci: update network module based on commit 7007e94 
Change-Id: I88629b9e03aa275ed226a4ddba5082132d51d6d3
(cherry picked from commit 2a0512489a96524c4c9e44675e44edcd510e9f36)
 2023-02-24 17:44:15 +08:00
Stone Li
fbc4de136f NEW: support to config ftp_folder for printer [P1P] 
Change-Id: I6a3b2a67d2950e2c1c5267bb7c65d5594924caec
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 176e505bcf5f48971302d9aff14e74b118eeafbe)
 2023-02-22 20:09:17 +08:00
gerrit
af7c6502f3 ci: update network module based on commit 78ea7a8 
Change-Id: I161dc948209360532d99f752c89f77e1346cc866
(cherry picked from commit de74a4cdbc2776a9d6b7ef3e6f4b6f53c11ceea1)
 2023-02-22 20:09:17 +08:00
Stone Li
cb2334559b NEW: add http server in BambuStudio 
Change-Id: I72d99277187ea0d6b600e741dcc4306bc5f44036
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 9ee36044158856e433b19e407094120bd15f4aa0)
 2023-02-22 20:09:17 +08:00
chunmao.guo
ee0f3c7a2f FIX: [STUDIO-2099] fix start new instance with renamed app 
Change-Id: Ic4ee24c3980f02d436ebf32c2b5c63cb34f3803e
(cherry picked from commit e4c2ff2a442253832b44bcd5e9e0ac40980cfcee)
 2023-02-02 12:14:41 +08:00
tao wang
563342c450 ENH:output new error: no space left on printer sd card 
Change-Id: If4ced6dcb1d6e2ccb5b1ad950744b9958d298fc7
 2023-02-01 16:24:44 +08:00
gerrit
a36b7c3a9c ci: update network module based on commit d91b2d9 
Change-Id: I710f94cb95a9158c26f0e6dbe2a9589d133eda2d
(cherry picked from commit 8d6ee467a83b2a85e7c5813274a73e6720889207)
 2023-02-01 16:24:44 +08:00
SoftFever
2492e5d39c merge upstream changes 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-21 00:37:10 +08:00
SoftFever
1bdedb1c47
Feature/fix more colors (#193) 
* fix more colors

* fix more color on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* fix new windows issue on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
#137

* Support more PrusaSlicer variables

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* enhance compatibility: bed_shape and wipe_start_x

* fix more color

* build deps

* only build for PR

Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-01-18 23:06:39 +08:00
gerrit
f8d0fc374f ci: update network module based on commit 8836418 
Change-Id: I765e67382a07ef14171ec14e51b47b036683a7c5
 2023-01-10 19:08:26 +08:00
tao wang
47a46010bd ENH:allows the user to enter a printed IP address 
Change-Id: I9d2617d0dd42f53e93d61e98bcf3cc97979a93f6
(cherry picked from commit 24ab56f8568e9637634e97a0632309cfd2762749)
 2023-01-10 19:08:26 +08:00
lane.wei
f0908f2a63 FIX: repair: fix the state not correct issue after repair 
Change-Id: Ic4aaeaeeee921294e0a5ab6d82517dc28f8822c8
 2023-01-10 19:08:26 +08:00
SoftFever
260156648d Merge branch 'master-remote' into SoftFever 
# 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/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
 2022-12-31 15:15:58 +08:00
gerrit
3c386f3739 ENH: update networking version 
Change-Id: Ic670cf14c1171268ed0ade38145e8e39a16ad7ea
 2022-12-26 05:31:54 -05:00
lane.wei
697d945ca1 ENH: add the logic to prompt user to update network plugins 
Change-Id: I73cce20e58783a365ad2665c8e095dcf2e9c02ea
 2022-12-26 05:31:54 -05:00
Zhaofeng Li
7dbf39465c Add missing includes for boost::filesystem::load_string_file 
Deprecated in Boost 1.79.0 and no longer included by
filesystem.hpp.
 2022-12-25 14:29:34 +08:00
SoftFever
a688719e72 Revert "Merge branch 'SoftFever' into feature/calib" 
This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
 2022-12-25 12:39:45 +08:00