walterioo/OrcaSlicer-KX
1
0
Fork 0
forked from viewit/OrcaSlicer-KX
Code Pull Requests Releases 2 Activity
1,499 Commits 10 Branches 9 Tags
5eb88dbd5e1d473314e563c3340e20ca4d25bcc1
Commit Graph

34 Commits

Author SHA1 Message Date
SoftFever
84bc585522 fix mac 2022-12-16 23:15:27 +08:00
SoftFever
df491e0c8e minor change 2022-12-16 21:52:38 +08:00
SoftFever
1ec149b4e1 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
chunmao.guo
956610fa0a FIX: [STUDIO-1574] not switch filament preset after wizard 
Change-Id: Ica703553a6994456f12b509564443902697ed374
 2022-12-15 04:38:15 -05:00
lane.wei
5e51ae3845 ENH: CLI: some refines on compatible logic 
1. export compatible related values to 3mf
2. process compatible related values when loading

Change-Id: Ib7ed3d165cda5d62e0074652d474567494141631
(cherry picked from commit 989fe6439d573457fa78afc5376d04d3120dbbfd)
 2022-12-15 04:38:15 -05:00
chunmao.guo
7d213cf94b FIX: [STUDIO-1592] float number format of German for flush volumes 
Change-Id: I78a5d7aed836cc4ed980496f68d22c68c11c2b77
 2022-12-15 04:38:15 -05:00
yifan.wu
f963fe11fe ENH: optimize WipeTowerDialog logics 
1. flush_multiplier will be apply the the flush volume during slicing
   rather than only in auto-calc
2. mark too small flush volume as red instead of a warning dialog
3. do not forbidden flush volume lower than the nozzle volume
4. fix incorrect focus status of text input box in WipeTowerDialog
5. check the minimum flush volume based on flush_multiplier
6. limit the decimal digit to two places

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Icdcc50c88ecd9463fb9ce73f996d57c2d9f0187f
(cherry picked from commit 60e01edc511f117b05a8a9b92aaf6fd55325e485)
 2022-12-15 04:38:15 -05:00
lane.wei
9940a96d4f FIX: fix the default materials loading failed issue 
Change-Id: I9341e6ec209673585a9ed3a981db92d28ac30659
 2022-12-15 04:38:15 -05:00
chunmao.guo
71a0727a7d FIX: [STUDIO-909] not dynamic inc filament_presets size 
Change-Id: Ie231667213cceec1bca56e1af8eabd6503bd3fed
 2022-12-15 04:33:48 -05:00
chunmao.guo
2ff9870e79 FIX: [STUDIO-1249] tips on syncing unknown ams filaments 
Change-Id: I754ca576e1e0e832a6c69a2bf4bef58900252040
 2022-12-15 04:33:48 -05:00
chunmao.guo
f2d02f2300 FIX: save and restore filament colors and flush volumes 
Change-Id: I04b80d95e6a3e23ef3561e512673ea39dfc3ff0c
 2022-12-15 04:33:48 -05:00
zhimin.zeng
b2d9873ce6 ENH: remember the filament_opts and limit minimum flushing volumes 
Change-Id: I7b2538fcaf5b5fc5e4f86191207de981bd766a89
(cherry picked from commit 392be8d2a4e9465fffc4018da77c6ee00ad46ade)
 2022-12-15 04:33:48 -05:00
liz.li
10bffb217a NEW: add custom printer config wizard 
Change-Id: I48f34039635803c3f1cee4cc2c853a0ffa5b451a
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 387ba2a5aac05d3b3af0923f88415188ae8cb44e)
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:33:48 -05:00
SoftFever
b8c6487a07 Merge branch 'master' into SoftFever 
# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	version.inc
 2022-11-08 11:22:03 +08:00
Stone Li
4278676275 FIX: clean preset_folder when logging out 
Change-Id: I0a61db6b6ae0fc4bad1f178e1492384a42de1501
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-11-07 19:59:23 +08:00
SoftFever
da24d86f5c fix crash when there are unicode string in the model path 2022-10-26 21:23:51 +08:00
SoftFever
b531270aa4 support changing thumbnail size 2022-10-23 23:00:46 +08:00
SoftFever
0267e2f230 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
dcf0d7ea80 Fix: fix the user directory not found issue 
wrongly delete by update_user_presets_directory with empty username

Change-Id: I88521cddde5db5aeaccdbc62b09db74f5f596fbe
 2022-10-20 19:34:37 +08:00
lane.wei
d2a5f6ffb2 ENH: add logic to load default filaments of newly added model 
1. fix the prefer_model issue
2. when a printer is visible and no filament is selected, just set its default materials to visible
3. add some log for shutdown debug

Change-Id: I599dbd9c8b180c944ff4086c7638267ff002f94a
 2022-10-20 19:34:37 +08:00
Stone Li
cf032b2d72 ENH: some improvements and fixs 
1. create user folder if not exists
2. add a tips for binding a printer
3. fix sdcard tips
4. modify icons
5. refine layout of task options

Change-Id: Ic0529cf1e8bdde0128052bc42454f6e6aaae87ca
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-10-20 19:34:37 +08:00
lane.wei
63fdb9afac ENH: do not throw exception when data directory creating failed in some cases 
if the directory already created by other instance
do not throw exception

Change-Id: I3ebde1ab62fa85ea946b6aeafc87aa7468327ce6
 2022-10-20 19:34:37 +08:00
SoftFever
8eff6e6641 Merge mainstream changes 2022-10-04 13:51:34 +08:00
chunmao.guo
21e449459d ENH: sync with ams filament 
Change-Id: Ifa8b9487c934a18ad1003f380bbb53fa9288e387
 2022-09-29 11:16:43 +08:00
SoftFever
11a852bd40 connect to production server 2022-09-04 19:54:31 +08:00
SoftFever
2e2263d7b7 Merge remote-tracking branch 'remote/master' into SoftFever 2022-09-03 00:17:59 +08:00
zhimin.zeng
da8348cef3 FIX: remove user preset folder when logout 
Change-Id: I64f0e46de7a91264c3c50188bbad2ac1409bcc0d
 2022-09-02 13:16:54 +08:00
chunmao.guo
d58748dc96 ENH: export current preset configs 
Change-Id: I75642f9786ed14e4e6e2048f4a70e7bb49bff03f
(cherry picked from commit 31886319c0a3f1adea301e01a9f49834c1c92670)
 2022-09-02 12:52:18 +08:00
SoftFever
2671e3969d Profile rework (#4) 
* default BBL profile

* voron

* wip

* Voron profile

* Prusa MK3S

* add Prusa mk3s

* fix an issue that print_host value was not retrieved.

* add chamber temperature option for filament

* slightly adjust thumbernail angle

* Revert "slightly adjust thumbernail angle"

This reverts commit 6ad38efb36c66abe82c7fdeb23f6a24aac43654e.

* add `one wall on first layer` option

* save preset for connection

* remove unused options

* set default 3000 accl for MK3S

* tweak profile

* update Voron logo

* UI twwaks

* Readme update

* change abs default nozzle temp

* misc

* tweak profiles

* Update README
 2022-08-24 15:40:43 +08:00
SoftFever
707b3085b3 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
ec43ca2e1a Revert "Support upload g-code to third-party printers (#2)" 
This reverts commit dc5e0eed34.
 2022-08-20 23:05:25 +08:00
SoftFever
e843afab61 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
lane.wei
c4d7b5b86b Fix the preset incorrect issue caused by logout 
when logout, if the preset selected is still there
we should not select it by force, which will cause the edited preset cleaned

Change-Id: I930cfcb04eae7473f6bc5f037d26b852013b6f42
 2022-08-05 16:11:42 +08:00
lane.wei
f8756e6c89 Add the full source of BambuStudio 
using version 1.0.10
 2022-07-15 23:42:08 +08:00