viewit/OrcaSlicer-KX
5
1
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases 4 Wiki Activity
829 Commits 5 Branches 4 Tags
520c4e7f322dc1fa545facd0d4de3d17fe4b89ff
Commit Graph

45 Commits

Author SHA1 Message Date
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
salt.wei
780faefcfa ENH: change picture size of ender3 
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2b7c2b4e7d35dd8d19473e13918cc27bf9d75649
 2022-10-20 19:34:37 +08:00
zorro.zhang
c5b7eded0b ENH: Only Default Choose Bambu 0.4 Nozzel 
Change-Id: I4fe32929e50cc9f45fda620399c7ea3e49cf998f
(cherry picked from commit 0df73d322859145ff65ccbbaa08205881209a9f2)
 2022-10-20 19:34:37 +08:00
salt.wei
76ee9fe424 ENH: add preset for ender3 printer 
As title.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2d9b1aaeadfe945a6a90f34cdb10a1f240a50ae4
(cherry picked from commit a223ab23605c3ef96ae878b9c4d2199520b4f201)
 2022-10-20 19:34:37 +08:00
salt.wei
2f92cc39fa ENH: add preset of voron 
As title. Thanks SoftFever.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I752413251b7699f8d1d26c44d71d912e1ef09c7b
(cherry picked from commit 606a69173e10d0a45e1f1987c36e45c3c89a7f09)
 2022-10-20 19:34:37 +08:00
SoftFever
8eff6e6641 Merge mainstream changes 2022-10-04 13:51:34 +08:00
SoftFever
62b119f365 Revert "Add support for FLSun V400(WIP)" 
This reverts commit 58871a08e0.
 2022-09-30 16:18:32 +08:00
zorro.zhang
a0d53bcf18 ENH: Homepage-contextmenu UI same with prepare-ui 
Change-Id: I8745ce516f2d1dd945826ec6e1f14aba6ec793bb
 2022-09-29 11:16:43 +08:00
SoftFever
bb9e9471c7 Add support for FLSun V400(WIP) 2022-09-25 13:41:43 +08:00
SoftFever
e4924e29e4 Merge branch 'master-remote' into SoftFever 
# Conflicts:
#	src/slic3r/GUI/MediaPlayCtrl.cpp
 2022-09-13 23:04:58 +08:00
yifan.wu
0b22b85365 ENH: update 3d text cover 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ieef62398bcd88cbfcb1fc82775d0bbcc1f61aaf5
 2022-09-13 19:42:32 +08:00
SoftFever
f32bdcc423 Revert "Revert "ENH: filament just show bundle machine"" 
This reverts commit bf416a975c.
 2022-09-10 00:44:55 +08:00
SoftFever
a09ffa2131 Merge remote-tracking branch 'remote/master' into SoftFever 
# Conflicts:
#	src/libslic3r/Preset.cpp
 2022-09-09 21:54:57 +08:00
zorro.zhang
7adb8bcee8 ENH: self-adaption UserGuide Icon arrange 
Change-Id: I6b04d7b54bd73ae0c7864cc6e1661b44c6d6c059
 2022-09-09 19:59:27 +08:00
yifan.wu
b8cd204dc5 ENH: add Chinese text for user manual 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie0b95d53e3c50fa8a9462c79ea0ae713540db254
 2022-09-09 19:59:27 +08:00
zorro.zhang
17bc41006f ENH: Fix Default Material Logic 
Change-Id: Iac40c7717e55ca7c2502cfd1012e33e1e6d88695
 2022-09-09 19:59:27 +08:00
yifan.wu
dba64bcdc0 ENH: refine text & icon for Recent's context menu 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I194afa16ad9b2c928548e7011a40718f9a53be8c
 2022-09-08 21:49:36 +08:00
yifan.wu
99df907841 ENH: update user manual covers 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I24eb5f391ebf2b350afafa4062e11852a7a3c669
 2022-09-08 21:49:36 +08:00
zorro.zhang
f438a9bf2d ENH: Adjust Homepage UI 
1, User Guide Image, Top add round corner
2, Change Guide description text color
3, New UI of Mouse Right Button Menu

Change-Id: I82cf82a97e35f16478020fabada17b5637cff625
(cherry picked from commit a3a56392788a9eabc9bb0cc20ecb48050869476b)
 2022-09-08 21:49:36 +08:00
zorro.zhang
0971013c2d ENH: Adjust Homepage UI 
Change-Id: I6d2556241d7a3eb68f4e73ef905c12d07a8ad77f
(cherry picked from commit 8ebcf2de6991d4aaad1f49571493fd9d99fdd9cc)
 2022-09-08 21:49:36 +08:00
zorro.zhang
702773ca7c ENH: new default recentfile image 
Change-Id: Ibb46b5a754e42f40b4d3ea773ca551208e0aef46
(cherry picked from commit b3a66ec1a387426842b8c43f38986ef8ada59d6f)
 2022-09-08 21:49:36 +08:00
SoftFever
debe72d525 Revert "ENH: filament just show bundle machine" 
This reverts commit 2ac9267e42.
 2022-09-05 21:59:19 +08:00
SoftFever
2e2263d7b7 Merge remote-tracking branch 'remote/master' into SoftFever 2022-09-03 00:17:59 +08:00
yifan.wu
91c2ad3308 ENH: refine the guide pages 
1. remove editable status of pages
2. refine the user manual text

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I39ca064e15f5c7c58e491b1929eb69e4a6692a08
 2022-09-02 13:16:54 +08:00
yifan.wu
9ea69d0158 ENH: add contents to user guide 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I46e943ce40049a80715ba67c4e73a3587991fe82
 2022-09-02 13:16:54 +08:00
zorro.zhang
be32500a52 NEW: homepage and UserManual 
Change-Id: Iecdb4d0151a0cf76614548aee69e525ad7e1fe68
(cherry picked from commit 4c7403683b334e42d8676a933012e2133cd1ce7f)
 2022-09-02 12:52:18 +08:00
liz.li
8eedf4e8b7 ENH:close dialog by pressing esc key 
Change-Id: Ib883e7119699e06f63c61dd083ad761ba58bc19c
 2022-09-02 12:52:18 +08:00
SoftFever
b6c1f101f8 Merge remote-tracking branch 'remote/master' into SoftFever 
# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp
 2022-08-28 12:03:49 +08:00
zorro.zhang
812f8fbcd7 ENH: filament just show bundle machine 
Change-Id: If0a35037dc4b08df7cd3aaf88662638a334196e3
(cherry picked from commit 5ebd67880a679c3013fe10b63b509761eab30670)
 2022-08-26 09:25:59 +08:00
liz.li
15065e2332 ENH:add shortcut in macos 
Change-Id: I2c2145caab987fcb8073c4e7891769142dab840a
 2022-08-26 09:25:59 +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
c9fb533769 Merge branch 'master' into SoftFever 2022-08-11 20:06:32 +08:00
zorro.zhang
ed4b2ab020 ENH: Optimize some web UI 
Change-Id: I91f6691e5e5c19274c1bc3e6a9386e3f76ab259d
 2022-08-05 16:11:42 +08:00
liz.li
4f727e604e ENH:adjust button border color in webview 
Change-Id: Iea050335b1f51d95c4f14ab06bc1514b0f7209f4
 2022-08-05 16:11:42 +08:00
zorro.zhang
c5e66ee25d ENH: Login button add Largen UI-Action 
Change-Id: I40f668364730205c6cc1b916ef486fce836c08d8
 2022-08-05 16:11:42 +08:00
zorro.zhang
83685085d8 ENH: support 3rd printer model 
Change-Id: Ib8c2c846f73a6ac14339e1d0222204d7440de014
 2022-08-05 16:11:42 +08:00
liz.li
b936bb8348 ENH:keyboard shortcut in macos 
1.fix:global shortcut cannot use in webview panel
2.fix:ban original web-shortcut in webview
3.add cmd+q & cmd+h shortcut in macos
4.move some global shortcut to prepare panel

Change-Id: I17ba3c86069dab92df754a319d0c0c3d77b34d74
 2022-08-05 16:11:42 +08:00
SoftFever
721c211a0f Merge remote-tracking branch 'remote/master' into SoftFever 
# Conflicts:
#	resources/profiles/BBL/filament/Bambu PC @BBL X1C.json
#	resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json
 2022-07-23 20:29:33 +08:00
SoftFever
1de4cbc5fb Add Anycubic 4Max Pro support 2022-07-23 10:31:41 +08:00
lane.wei
af0b3ddb28 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
SoftFever
faae5824ef Add Voron 0.1 and Prusa MK3S support 2022-07-19 06:27:26 -07:00
SoftFever
9e9601ce89 fix voron image ratio issue 2022-07-19 06:27:26 -07:00
SoftFever
ee552fa78a reduce image size 2022-07-19 06:27:26 -07:00
SoftFever
31c7c27a5c Add Voron machine support 2022-07-19 06:27:26 -07:00
lane.wei
f8756e6c89 Add the full source of BambuStudio 
using version 1.0.10
 2022-07-15 23:42:08 +08:00