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
22243 commits 10 branches 72 tags 3.3 GiB
Commit graph

182 commits

Author SHA1 Message Date
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
SoftFever
d733ab7e7b Merge branch 'master' into SoftFever 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
 2022-12-21 16:54:14 +08:00
Zhaofeng Li
99043bbb02 Add missing includes for boost::filesystem::load_string_file 
Deprecated in Boost 1.79.0 and no longer included by
filesystem.hpp.
 2022-12-16 22:51:07 -05:00
SoftFever
bf8a9fee1f Merge branch 'master' into SoftFever 
# Conflicts:
#	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/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
 2022-12-16 13:59:30 +08:00
Stone Li
efc761d794 ENH: set ssl version to 1.2 
Change-Id: I859d55b0b0adf04e79ae812fafb04dc310ca4587
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:49:14 -05:00
tao wang
5c3c2fcb1c FIX:changed top menu bar color on macos 
Change-Id: I276aab27c2c089ad322dc5cb2f6206dccb3e494d
 2022-12-15 04:38:15 -05:00
Stone Li
00dfd1e765 ENH: modify diff for github 
Change-Id: I3a441dbfa3167de3cee9fdafe62f7860fcb6891c
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
gerrit
6e16906143 ci: update network module based on commit 70ff61b 
Change-Id: I4fb0a7bb95989b938c85e6da0ef4a6b32a0d0bb4
(cherry picked from commit ce840596f1c033ada5392ced4a7812551888abf6)
 2022-12-15 04:38:15 -05:00
chunmao.guo
efd55bcffe FIX: [STUDIO-1599] not erase unfinished EnteringGizmo snapshot 
Change-Id: I6faddf5de78e3e6ba40f5e962a4d4de0f2739e4d
 2022-12-15 04:38:15 -05:00
chunmao.guo
a1fcd05baa FIX: [STUDIO-1570] wkwebview background color 
Change-Id: I6b18a2dbf654b71bff88e0c14317d4479358218a
 2022-12-15 04:38:15 -05:00
chunmao.guo
11ea1e36ea FIX: [STUDIO-1486] set drawsBackground false for NSTextField 
Change-Id: I46d6a2812d27e30cf56c037e33bb97d3d063a5b5
 2022-12-15 04:38:15 -05:00
gerrit
5e410fe5ef ci: update network module based on commit fc539ac 
Change-Id: Ie3eed0c22f01af228c0507eb131a1041f3fde3a8
(cherry picked from commit 0d728271668dcb85b7764859bf99f701695c5124)
 2022-12-15 04:38:15 -05:00
tao wang
72b4827f85 ENH:displays the publish button based on user permissions 
Change-Id: I853506fa61f1f8cf14dfeb4601c8bb5f1a0c5914
 2022-12-15 04:33:48 -05:00
gerrit
6834f0096b ci: update network module based on commit 1addfb7 
Change-Id: I73401577238aa76cb9a9e1d2e20f19543c0cc276
(cherry picked from commit 1b04c461c1f85d2d26294af244512e7346e5876a)
 2022-12-15 04:33:48 -05:00
tao wang
407d1faf0d NEW:add model mall system 
Change-Id: Iccfe460cd7bfd11d91cdd7eddf142a8590e3c5b0
 2022-12-15 04:33:48 -05:00
SoftFever
5bb0addb3d Merge branch 'master-remote' into SoftFever 
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	version.inc
 2022-11-28 20:46:53 +08:00
gerrit
b77682c13f ci: update network module based on commit b27bf8e 
Change-Id: I31fd12de0b7f9b457f925a834fdc273bd944f966
 2022-11-26 15:39:32 +08:00
gerrit
bcff4f81c2 ci: update network module based on commit 175cde3 
Change-Id: I7a803608dfc894644d1c074856a35a84fa231d84
 2022-11-26 15:39:32 +08:00
lane.wei
fcf490028a ENH: Updater: always update plugin to the newest compatible version 
Change-Id: Icec343ba4913b9738add9564c78934553a33336c
 2022-11-26 15:39:32 +08:00
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
lane.wei
a73c504ea3 ENH: support sub-directories under system profiles 
when copy directory, will copy the sub-directory recursively

Change-Id: Ib49cc38aaf889556b0b94f0e4d20451d3d4f03b2
 2022-10-20 19:34:37 +08:00
lane.wei
f3a5a50199 Fix: add the preset auto-copy logic at bootup 
sometimes the installed profiles are deleted by the installer/uninstaller
add the auto-copy logic to make sure it is there after bootup

Change-Id: I2e7c9eb7576672377c0f08575d17c775282f4671
 2022-10-20 19:34:37 +08:00
gerrit
79005d0e2e ci: update network module based on commit 07ca983 
Change-Id: I096991aeac7f01c80d76767d274be9ebf414af84
 2022-10-20 19:34:37 +08:00
lane.wei
c2c7a6786d FIX: fix the vendor disappear issue after de-select the printers in newbie_guide 
after the vendor profile is deselected
the system files are deleted from userdata dir
we should always load the other vendor's profiles from resource instead of userdata dir

Change-Id: I29220d30d203ea318092430c02cfa662caf0f388
 2022-10-20 19:34:37 +08:00
Stone Li
91d5ba2870 NEW: support send gcode to third-party printer 
Thanks SoftForever for your works to support
sending a gcode file to third-party printer

Change-Id: I3cba43c8bd878f1f1c2fd5fae202ed4d922e8727
Signed-off-by: Stone Li <stone.li@bambulab.com>
 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
tao wang
29e19cb32e NEW:added sending gcode file to sdcard 
Change-Id: I60654676a3001c59b8202581576fbfcd5f8388eb
(cherry picked from commit 930b8e034aaa55743aa02fc6e3961fdc388ce53c)
 2022-10-20 19:34:37 +08:00
gerrit
631dd00038 ENH: update network module based on commit 9f48f1f 
Change-Id: If0215a649eb4480f0139640f40968b3e87f48017
 2022-10-20 19:34:37 +08:00
Stone Li
497be311db NEW: add get_my_message interface 
Change-Id: If904d6b5692a12bdbca7732002d5bf4e83a85932
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-10-20 19:34:37 +08:00
gerrit
54046b750b ci: update network module based on commit 2687434 
Change-Id: I653f7e05ea11155fb906610d1549827e38f2de8b
(cherry picked from commit 4672e15697dd012a915f5e7bb17b378cff4249b6)
 2022-10-20 19:34:37 +08:00
tao wang
e325214cb6 FIX:fixed crash when creat projecy in full screen mode on mac 
Change-Id: I029bf52e805d699a5d6de4e3a049954b09e58255
 2022-10-20 19:34:37 +08:00
SoftFever
764b7d62a0 Merge mainstream changes 2022-10-04 13:51:34 +08:00
lane.wei
e228e72db1 Fix serveral issues on Linux environments 
1. fix the crash issue in ComboBox
2. fix the network agent directory not correct issue
3. fix the first 3d tab switch failed issue
4. fix the filemenu not correct issue

Change-Id: I6a99218c0f7edbd57114ca1d9ff8c5c020d26d94
(cherry picked from commit b5e1b06af42aea9d1413be29dd58150b2ac8d470)
 2022-09-29 11:16:43 +08:00
SoftFever
de874acc99 Merge branch 'master-remote' into SoftFever 
# Conflicts:
#	src/slic3r/GUI/MediaPlayCtrl.cpp
 2022-09-13 23:04:58 +08:00