3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-09 21:07:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
28453 commits 13 branches 76 tags 2.1 GiB
Commit graph

111 commits

Author SHA1 Message Date
Argo
ffc8a3e307
Adds (AMS) filament sync options: Only sync color / sync all (#12169)
Some checks are pending
Build all / Build Linux (push) Waiting to run
Details
Build all / Build Non-Linux (push) Waiting to run
Details
Build all / Unit Tests (push) Blocked by required conditions
Details
Build all / Flatpak (push) Waiting to run
Details 
This PR adds a new filament sync mode setting for device-based filament synchronization.
Users can now choose between syncing both filament preset + color (current behavior) or syncing color only, so calibrated local filament profiles are preserved while still updating slot colors from the printer.
It also includes small UI improvements for the new preference entry and sync status messaging.

<img width="665" height="671" alt="image" src="https://github.com/user-attachments/assets/23980846-0113-48ab-84aa-adf5cdab8ab6" />
 2026-02-10 09:12:30 +08:00
Argo
1aee0cf526
AMS Filament sync fix for locked Tool 1 & 2 (#12180) 
Toolchanger printers with 4 tools were incorrectly treated as dual-nozzle (IDEX-style) printers in AMS Sync. So I was locked to just tool 1/2. 

Adjusted AMS Sync to use dual-nozzle logic only for true 2-nozzle setups (nozzle_nums == 2 and filament_map in {1,2}), and route 3+ tool toolchangers through the generic mapping flow so all tool IDs are handled correctly.

Before: 
<img width="2276" height="1738" alt="image" src="https://github.com/user-attachments/assets/ccebc020-37cf-4af6-8568-a9f331f6c08c" />

After:
<img width="2236" height="1662" alt="image" src="https://github.com/user-attachments/assets/030f49c3-463d-4355-95ba-ba8f95a01ecd" />

Tested on / with:
- Snamaker U1
- ARM macOS
 2026-02-05 18:18:59 +08:00
Noisyfox
760f66d3d7 Merge remote-tracking branch 'upstream/main' into dev/p2s-pr 
# Conflicts:
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrePrintChecker.cpp
#	src/slic3r/GUI/StatusPanel.cpp
 2025-11-18 09:17:13 +08:00
Alexandre Folle de Menezes
77f7514d97
Fix spacing and punctuation issues (#11244) 2025-11-17 09:35:53 +00:00
xin.zhang
ff1e48a9c4 FIX: the event should be skipped, so that the CheckBox could be toggled 
JIRA: [STUDIO-14861]
Change-Id: I72e9e77c0e81e9cf64de7258ca09c225d5c3f807
(cherry picked from commit 9861c3d6bcd7e2720d1fccaacb820e13b5d7adb7)
 2025-10-28 15:29:58 +08:00
zhou.xu
a57cc4aa58 FIX:Fix the display issue of dropdown boxes at different resolutions 
jira: STUDIO-14605
Change-Id: Ib15b721be1b0e56652bea38d4754032f9a056792
(cherry picked from commit 2044bc85596177c8df4d74299d25498007b5213f)
 2025-10-28 15:29:55 +08:00
xin.zhang
299b821c5f ENH: support mix mapping 
jira: [STUDIO-13673]
Change-Id: Ic1c89457f5154c108dbab41850ed49561aa34fde
(cherry picked from commit 12942e0545424e2528cc3f3c9aa6947b76469b3d)
 2025-10-28 15:29:50 +08:00
xin.zhang
1494731eab FIX: check with internal filament type 
jira: [STUDIO-14216]
Change-Id: I89e0d62b572872d7e2ea8e6e57ac662b64baf92b
(cherry picked from commit 6767c2334bbfcffa41d4d020ee4f2e183a327cee)
 2025-10-28 15:29:47 +08:00
Noisyfox
1bbdb3fa8e Fix dialog icon 2025-10-19 11:41:50 +08:00
Noisyfox
56d8bd8fbe Fix option nullable 2025-10-10 16:57:16 +08:00
Noisyfox
3ea51fc41f Fix crash when sync ams 2025-10-08 22:43:22 +08:00
Noisyfox
754e602b53 Fix color & position of device info sync dialogs 2025-10-08 18:03:20 +08:00
Noisyfox
a9c0490c68 Update color 2025-10-05 16:02:17 +08:00
xin.zhang
4a787f6ff8 ENH: clean codes about device 
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
 2025-10-02 09:30:48 +08:00
haolin.tian
e17c8bfb80 FIX: remove legacy MQTT optimizations; disconnect previous printer on switch 
jira: STUDIO-13455

Change-Id: I88f48801f443b3830fbd2bccbc53577f615e6d96
(cherry picked from commit 562ac1a3e7e75e1cab5e42ab09cec719bf698184)
(cherry picked from commit 5143086c5efb4d974e27ba4f55bd82752ded0a93)
 2025-10-01 23:32:08 +08:00
zhou.xu
517b6c09a8 FIX:WxColour (0x00AE42) represents bgr input, incorrect use 
jira: STUDIO-12347
Change-Id: If03e23f2ee7cbb5dcb124453fb0a1ea67c3633a0
(cherry picked from commit 8a22fab6d73fe2694b5006712d5e72619ddea51c)
 2025-09-24 10:40:45 +08:00
zhou.xu
d7c15664dd ENH:moudify text for SyncNozzleAndAmsDialog 
jira: STUDIO-12221
Change-Id: Ib6ba969ca97da53d7bcc04b5db08d83389bf4b5c
(cherry picked from commit 37013329a69854545be2d369021f89e54b9727ec)
 2025-09-23 17:20:09 +08:00
tao wang
0317e0dd88 ENH:auto switch to using local broker for data transmission 
jira:[STUDIO-11616]

Change-Id: I91066a629684dcff4efc73f310c2e0a7843954f4
(cherry picked from commit ac805e7d9150f56d40ec261fd2ed4007e1413b8e)
 2025-09-23 09:20:15 +08:00
zhou.xu
6871bdd3b9 ENH:update text 
jira: STUDIO-12117
Change-Id: Idb8af2fd8826c6e0098dbb9ece1da6b8b9109c96
(cherry picked from commit 38364e36c19ba3d35bf08656d5cc62bb5849f21f)
 2025-09-23 09:05:19 +08:00
zhou.xu
d408db2fde ENH:change wxStaticText to label in linux to solve darkmode problem 
jira: STUDIO-11419
Change-Id: If7373deb03962ffd860a02acbf47b66f4dd68539
(cherry picked from commit c4325ade348731764afe3e645768387e402f8332)
(cherry picked from commit 02fcbc785efae3c96a134a7ae77920693c95dc08)
 2025-09-21 18:03:25 +08:00
tao wang
dc56608d13 NEW:add pre print checker 
jira:[none]

Change-Id: Ic1469d30dff30e1eba92d8bfacf58d0f0b789157
(cherry picked from commit 8cfa735c6cac432a2b97dea7703e810f8eef6d04)
 2025-09-21 13:48:03 +08:00
xin.zhang
f5314b2ae1 ENH: remove unused codes 
jira: [none]
Change-Id: Ia4c14367577ffff9ddcdaf528a8e79f9c1a59209
(cherry picked from commit 7ac47daa69c25c1830ebe4a54b8ce25fdfb00114)
 2025-09-21 13:48:01 +08:00
xin.zhang
472a48acc6 ENH: add nozzle type ntTungstenCarbide 
jira: [STUDIO-11597]
Change-Id: Ibec41549042d253aeb85ba81e93e7c26a4a56ed2
(cherry picked from commit 1352cff31427eadd2c85ce4c9602ab3379a5ae9e)
 2025-09-21 13:48:01 +08:00
zhou.xu
d367136341 FIX:Missed an unmatched processing and add update_final_thumbnail_data 
jira: STUDIO-11528
Change-Id: Ibc5b8423731d5028c8f3d2fb14518cfd26293a21
(cherry picked from commit d66d18529a874de5314748ee0cfded6b459eceb8)
 2025-09-21 13:47:58 +08:00
zhou.xu
d692b8b6cb FIX:fix ams sync error when all map is unmapped and change to override mode 
jira: STUDIO-11482
Change-Id: If73721c9a0419c616201c441a1ce6e5a4fed380a
(cherry picked from commit 3cf6d2e3afaa8975031b1464b303e6f6a326ddb7)
 2025-09-21 13:47:57 +08:00
zhou.xu
836cfc5383 ENH:For reset buttons in small language environments, use fixed spacing 
jira: STUDIO-11335
Change-Id: I6869c677176f9048731d23eb993dc3b0076f56b8
(cherry picked from commit 6c8df0c5be8168aabe60eb96eebc7bb2372be462)
 2025-09-21 13:47:52 +08:00
xin.zhang
94fed58ff9 ENH: update Send to print dialog 
jira: [STUDIO-11230][STUDIO-11260][STUDIO-11259]
Change-Id: I6fdbeebf2a491f354c122eb35e5858bd6e72591c
(cherry picked from commit f3992d3e9420e0bd4987c6ca4cfe96f9f35bdcd1)
 2025-09-21 13:47:52 +08:00
zhou.xu
2d3d68c922 ENH:When the AMS option is turned on or off, update the correct thumbnail 
jira: none
Change-Id: Ia001e4baa7de72ab077cf0fb76c45d4cb8bac088
(cherry picked from commit 89aa62f8b4cd11fa10a898956f1c57ae1ef64a70)
 2025-09-21 13:47:50 +08:00
tao wang
157bec00a1 ENH:auto switch use ams option 
jira:[none]

Change-Id: Ia1d5231284515226277b16d771342141e654a23d
(cherry picked from commit 956f1b9a59c11bce0428c3162beac45a5272c919)
 2025-09-20 15:30:05 +08:00
zhou.xu
dd6fff08f7 FIX:delete no use code 
jira: STUDIO-11059
Change-Id: Ief3e45f4e6cc079c60161b9b9a55b2152013b70e
(cherry picked from commit ab26fb71a50c930c4c3945f91d275dbe78ea8c5c)
 2025-09-18 17:01:19 +08:00
zhou.xu
d87cbcf2f2 ENH:modidy width of SyncNozzleAndAmsDialog and FinishSyncAmsDialog 
jira: STUDIO-11045
Change-Id: I99164b2172aeb7fb955348fc87f7da24aefe930c
(cherry picked from commit 61f61bce3ed12fbceff7fe98eead6b27a39df5ea)
 2025-09-18 16:44:03 +08:00
xin.zhang
68741d019c FIX: move network hold to MainFrame 
jira: [STUDIO-10994]
Change-Id: I2c30ba3b0f17d52079332634a9a2dd138859e083
(cherry picked from commit 506e82cb02a79d97a30effde53fe85c7d278858c)
 2025-09-18 16:22:57 +08:00
zhou.xu
06a86289cc FIX:Optimize button and checkbox resolution adaptation 
jira: STUDIO-11003
Change-Id: Ia6325e3069a09cef45643442ad6f6ee929958446
(cherry picked from commit 7901e9fbaaa65e4746a16a89791a4a835db0e71e)
 2025-09-18 16:20:19 +08:00
zhou.xu
5113b2c2dc ENH:the "distance" var should init to 0 in the release environment of Mac 
jira: STUDIO-10967
Change-Id: I85b1e87dc80846f50c3bd29c7aa05f89c39d17de
(cherry picked from commit 4b368cb2ecafd53ad1bbe61946bb9b1bafce64cb)
 2025-09-18 16:16:20 +08:00
xin.zhang
907573a158 ENH: support msw_rescale 
jira: [STUDIO-10907]
Change-Id: I1e06043fad6345c47e8c5ceb28db204955aa0969
(cherry picked from commit 193caabdc79d966e8226b5a9b340763b1711d0f3)
 2025-09-18 15:43:34 +08:00
xin.zhang
293787609b FIX: show all re-fill while sending print 
jira: [STUDIO-10888]
Change-Id: I2b1a98eddd2c34a83a73ef7cbef39ab05d569aef
(cherry picked from commit ee76a2191ff633af3311ef659b9feb63e7bdedeb)
 2025-09-18 15:22:56 +08:00
zhou.xu
d434c743f3 ENH:add "reset all" function 
jira: none
Change-Id: Iac2c267e95ca0589bf2e6d6d536d70d3b3e4a70c
(cherry picked from commit 7239f7bfaad2e1dc488118188addda3fb015793a)
 2025-09-18 10:18:18 +08:00
zhou.xu
111d7ca501 ENH:modify text 
jira: STUDIO-10690
Change-Id: I5716f11b33550fae87948f7915b518f18dcab594
(cherry picked from commit 62a06d3351f05fca6459b0292497df6c6385a2d8)
 2025-09-18 10:08:17 +08:00
zhou.xu
dc9d5661c3 ENH:adjust UI in AmsMapingPopup 
jira: none
Change-Id: Ib2e7e642d7a1700abb92eca2546614b2fd7d2bd4
(cherry picked from commit 5c8d62097384836a1a6d496983734c4e3220baaa)
 2025-09-18 10:08:08 +08:00
zhou.xu
15c24d903f FIX:update_items_check_state after reset_one_ams_material 
jira: none
Change-Id: I1081445da90c6f3267121b864a0e0d868b6b719b
(cherry picked from commit 61a3ffbf4369df2b0a18f7c1f7480c51f24124e8)
 2025-09-17 23:09:13 +08:00
zhou.xu
587e524302 ENH:Optimize the case with only external components 
jira: STUDIO-9989
Change-Id: I7be626e8c86f684029a4c34fc8b800b880fe1fcd
(cherry picked from commit 1ea13f9846e5b66b0304cd4b6bcbfbb21d8919d8)
 2025-09-17 23:08:16 +08:00
xin.zhang
7b4b655ba1 FIX: update the mapping item 
jira: [STUDIO-9942]
Change-Id: I5b46fb530f08d0de4c8cf5a23707ec539d82356d
(cherry picked from commit 8b237bf959d2718c0397530af599c3a24a650d74)
 2025-09-17 22:45:11 +08:00
jun.zhang
51efa961d4 FIX: thumbnail anti-aliasing 
jira: STUDIO-10640

Change-Id: I70a7f6794a17df7d15b02bc7b4cdaee5bf95151a
(cherry picked from commit 9511a523632b6b12aa50cac1ae061d9062841bbf)
(cherry picked from commit ca259355bb71905868c8d231af66c719c2ccea48)
 2025-09-17 22:08:59 +08:00
zhou.xu
3d93ed271b ENH:Add a colon to the text 
jira: STUDIO-10691
Change-Id: I3cbc1dbc8c05689fe63f8c1af28cab2ab2cef6cd
(cherry picked from commit 986f0c72b85a1b1a0204d79cb149d684422c4b5b)
 2025-09-17 21:50:20 +08:00
tao wang
9252701cce ENH:remove useless ams information 
jira:[none]

Change-Id: I2c3319e19e3e46c575c28d8e3b3c41e63552b503
(cherry picked from commit b2ed01716b8fa0b18341e1dad50243e76b6a9ed0)
 2025-09-17 21:50:05 +08:00
zhou.xu
ef07246879 ENH:delete no use code and add log 
jira: STUDIO-10644
Change-Id: Ia12ea45553e2856d0c8784c2a87a1e86adece003
(cherry picked from commit 38f1f265cfb9f79030b48137d2949de9f25e782f)
 2025-09-17 17:56:31 +08:00
zhou.xu
06375250e6 ENH:add 'reset' button in AmsMapingPopup 
jira: STUDIO-10009
Change-Id: Ia924ae9cbe0bec33f1b37af12633a9cb64836182
(cherry picked from commit 3b8aa5993d93598173e412766a938af17ebb2da5)
 2025-09-17 17:56:25 +08:00
zhou.xu
d930c7cdc8 FIX:Fixed frequent switching of dark mode causing unclear window display 
jira: STUDIO-10618
Change-Id: I49ccbb4e59d9865f0e4f4d9cef96fe1e0d011e7b
(cherry picked from commit 184143ead7ec4beceb63076e91cedd955d040308)
 2025-09-17 17:40:52 +08:00
xin.zhang
84fa72a8bb FIX: the nozzle data check 
jira: [STUDIO-10528]
Change-Id: I5a20d52a92f4e6620239753a66fb5febcad19f39
(cherry picked from commit 679ec788e57932c2088b5b08f75128a93f0e0123)
 2025-09-17 15:06:27 +08:00
tao wang
18ffc5497b NEW:added inspection of pla-glow material 
jira:[none]

Change-Id: I1a62992e24665b83f54981e59edc1ba1fcda9a8a
(cherry picked from commit fa2fc22f3e648c0f0f485d1a7e701658693da457)
 2025-09-17 11:16:10 +08:00