Noisyfox
2375ab860a
Merge remote-tracking branch 'upstream/main' into dev/h2d
...
# Conflicts:
# resources/profiles/BBL.json
# src/slic3r/GUI/AmsMappingPopup.cpp
# src/slic3r/GUI/MediaFilePanel.cpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/StatusPanel.cpp
2025-09-16 14:46:40 +08:00
qing.zhang
e7e6405ad3
ENH:instead of prime_volume by filament_prime_volume
...
Jira: none
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I96e7d0604da8f90678feed81833e3a634752ffff
(cherry picked from commit be02e769bb49680d6be678fc5fa73a141ca8da1c)
2025-09-16 10:39:19 +08:00
zhou.xu
34eac964aa
FIX:fix bug for the base color of the color modification
...
after matching the untreated material
jira:STUDIO-10062
Change-Id: I699fd843600182bc87b224eee488e752b64ca0b4
(cherry picked from commit 29b0be89eb5190bd83d783bf173f14950aef738d)
2025-09-13 18:50:28 +08:00
jiangkai.zhao
8723b6987d
ENH: enhance some functions of the wipe_tower
...
1.Add automatic calculation of the wipe_tower's brim width by height;
2.modify the min_depth_per_height and the default ridwidth
jira: none
Change-Id: Idd96bc90e8e631aa8481b559e1e9fec24c6b822f
(cherry picked from commit 4dd4e9e12c02d945a0ac3fd2020f75313c5b2cc9)
2025-09-13 18:49:41 +08:00
zhou.xu
164fec343f
FIX:Unknown material display incomplete
...
jira: STUDIO-9997
Change-Id: I55409e5ba054eadf9200c22b8c6ab31223c3b689
(cherry picked from commit 5c6a752279c20d3bc2628edf9db0aa320bdf322d)
(cherry picked from commit e113538a1741465e6b25583c5e4101ea499debc3)
2025-09-13 18:46:59 +08:00
zhimin.zeng
7ce79938f7
FIX: Update blacklist
...
jira: none
Change-Id: I5ce98aeab6ee1a5b84b35c12c8caf3cf70f30ba6
(cherry picked from commit 7a0b8d91356d3bfb7f3052cc592bca165f844d44)
2025-09-12 17:43:44 +08:00
zhimin.zeng
a57a927481
FIX: modify the picture of X1E
...
jira: STUDIO-9844
Change-Id: Ic4dbdfa995588a17c9be66ce20876edc2c5c23cf
(cherry picked from commit dd15d0772f049651029da96c9ee46e2d8979dc7b)
2025-09-12 17:39:21 +08:00
Mack
a9349d1ef4
Fix:filament svg icon add transparent color
...
jira: STUDIO-9929
Change-Id: I7650670988d3c3538818278417ab9fb48c232400
(cherry picked from commit 45e7d7bb7de0b9c999d2ab0fbf0ca4441853324b)
2025-09-12 17:26:39 +08:00
xin.zhang
e988d38b14
FIX: update hms messages for AP
...
jira: [none]
Change-Id: Iaa5f15298d529cada6c7ebdcb112ed38c425d1b4
(cherry picked from commit 07e77c3d6168c357432dedd6882d534a70a95921)
2025-09-12 17:26:31 +08:00
xin.zhang
aa58b9b7ad
FIX: support the dark mode AMSPreview
...
jira: [none]
Change-Id: If4329081535a1155588afad932403ea3615163f7
(cherry picked from commit 32597b43f94813f3ad6ef99106e234fa9a180971)
2025-09-12 17:26:20 +08:00
SoftFever
d76524f03f
Update the Filament Selection Guide page by moving the generic filaments to the front.
2025-09-11 23:09:48 +08:00
SoftFever
4f50fdc94e
Fixed many profile issues and cleaned up some messes. ( #10686 )
2025-09-11 17:50:53 +08:00
SoftFever
5e9570c946
fix check_filament_compatible_printers
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
2025-09-10 23:21:45 +08:00
SoftFever
e3d55b3c5b
update profiles
2025-09-10 23:21:45 +08:00
SoftFever
13e8189b80
delete unused files
2025-09-10 23:21:45 +08:00
xun.zhang
606d28dc26
ENH: add tip link for filament group in viewer
...
1.Also update wiki
jira:STUDIO-9944
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iaa282054da40b6936dc6c741fe7ef7ca62f868f2
(cherry picked from commit caa51852afcaa207d4204b420612524cb0f7017a)
2025-09-10 16:55:08 +08:00
tao wang
d5e1689d8b
ENH:adjust the UI of the Mapping pop-up window
...
jira:[none]
Change-Id: I26f07db9a9d4fd565fde1e58d01e2c60380f8492
(cherry picked from commit 8f11826bc0d845d13489487fc647758d1e1f4565)
2025-09-10 16:22:21 +08:00
xun.zhang
1126d3f7dc
ENH: update custom gcode for H2D
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6c69c6ee3cd77c7b82d6b37592e9fc4ebfd539d9
(cherry picked from commit 785e0299719215f4a4f2b074ec7809e01f77f322)
2025-09-10 16:19:55 +08:00
zhou.xu
2456729002
FIX:fix bug of SyncAmsInfoDialog
...
jira: STUDIO-9948 STUDIO-9950
Change-Id: Ic97dfb7787c9e27386003b2dc3f88f1003456245
(cherry picked from commit 081df8f5809dc023487b239dc1419b20eacc7a40)
2025-09-10 16:14:02 +08:00
qing.zhang
34f4300f4e
ENH: add filament change length for color change
...
Jira: none
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I84ab638d6af056ede9b9524d1395eb42fa731150
(cherry picked from commit 9b46d437bad707d38a978bc768e0359979e5fb19)
2025-09-10 16:00:00 +08:00
chunmao.guo
6779336bb7
FIX: ams count dialog not default button
...
Change-Id: I5eb563d734953d185425f745acac3cfb3eadb4a4
Jira: STUDIO-9936
(cherry picked from commit a5acf20506aeb4c2720dbe367ae5651dda88df7f)
2025-09-10 15:30:29 +08:00
xun.zhang
733353fbc9
ENH: update nozzle volume for H2D
...
jira:none
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I21e56af3d4d2d3eb2ec4265ce3f34bac649b18f0
(cherry picked from commit 3213963399140b6d4035d8547af5215f123df686)
2025-09-10 15:30:00 +08:00
chunmao.guo
d01f553dc6
ENH: optimize set ams number popup
...
Change-Id: I7765b47785ee80d74d7b75701747585b6cd5db51
Jira: STUDIO-9829
(cherry picked from commit 3573bbd985cff965f7077326f0ba6c8d847b9043)
2025-09-10 15:03:50 +08:00
xun.zhang
c605f73d80
ENH: update translation
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9b260cb3e21b9052c9a2d65378bd0e795f6db6f3
(cherry picked from commit 2507eba37d5f09cca51b3e9f9f281b2208e57eb1)
2025-09-10 15:02:23 +08:00
zhou.xu
80cd896896
ENH:update SyncAmsInfoDialog
...
jira: none
Change-Id: Icdfaa85500a0f448b9959923b863e6fbf72b397f
(cherry picked from commit baa2282dede7886720cdb564ef4de22710c5528c)
2025-09-10 15:00:55 +08:00
xun.zhang
242f62861e
ENH: chamber temperature set to 60 for H2D
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic7f955888c3c451e36d1c12623f34a3487d6b9fb
(cherry picked from commit efc2548cd04fed3541069ea22603b816b3ed12b4)
2025-09-10 15:00:39 +08:00
xun.zhang
f29133cf58
ENH: update custom gcode for H2D
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I5747a7cf019fee24a79c26743fcd227948846b51
(cherry picked from commit 496786297834d72c530df595c79eaec1e1a95c20)
2025-09-10 15:00:31 +08:00
zhimin.zeng
b2c2289156
FIX: modify the wipe tower parameters
...
jira: none
Change-Id: I9b18166b83df71ace1585944741dffd18de42bbc
(cherry picked from commit 8df768a4479498fdfa82b227ce489006a09432ea)
2025-09-10 10:59:36 +08:00
chunmao.guo
d626c38ae7
FIX: something
...
Change-Id: I2923786337f97f4297b0444522c620891aa2ad90
Jira: STUDIO-9725 filament menu delete icon
Jira: STUDIO-9785 StaticGroup border color
Jira: STUDIO-9716 update badge icon
Jira: STUDIO-9815 click printer/bed panel for combobox
Jira: STUDIO-9867 label with for single noozle
Jira: STUDIO-9739 ams page up/down
(cherry picked from commit 1cde0b844a97f3420db4999927f05a833b92b0fb)
2025-09-10 10:43:06 +08:00
tao wang
e7215fef59
ENH:redraw the ams preview item
...
jira:[STUDIO-9823, STUDIO-9609,STUDIO-9366]
Change-Id: I9bb71986e474257dc4d22fcb66706e4f61228e4e
(cherry picked from commit 538316469a07ea27bf7b5a2c8b6cfeb86c1cf97e)
2025-09-10 10:37:50 +08:00
xin.zhang
d11a793774
FIX: update hms files
...
jira: [none]
Change-Id: If7bd7c159fe05340b3863d09f4dd1d1731c8ab4c
(cherry picked from commit ade9688be9b3f3d353c370398787cdd5a1463ca3)
2025-09-10 10:36:58 +08:00
zhou.xu
200a811dca
ENH:add "text to image" function in TextInput
...
jira: none
Change-Id: Ibdb57b74511432e81faa0c556bb6e639d5a174f5
(cherry picked from commit 09323aeed34f29f105b95d3d6a2c7a151e17e42a)
2025-09-10 09:55:52 +08:00
Arthur
7889dddee8
ENH: reduce 100% overhang wall speed to 10mm/s
...
The old speed 50mm/s is too high and cause some print quality problems.
Also change the display of overhang speeds to better adhere to the code.
jira: STUDIO-9641
Change-Id: I6efa981db5bf88a9cf5bb70abb443cdfa1783025
(cherry picked from commit 979fefffd528ab1fb4e670fd88f716a3aed2e6f2)
2025-09-10 09:35:38 +08:00
xin.zhang
086da0d4a1
FIX: the icon diffs in normal and dark display
...
jira: [STUDIO-9786]
Change-Id: I935133161d3ecf09b72eb235bba335c5086e5674
(cherry picked from commit fed792d3794c28a2a80341e252e95d9db6a209ff)
2025-09-10 09:24:31 +08:00
xin.zhang
2878eb50f1
FIX: add a warning dialog
...
jira: [STUDIO-9715]
Change-Id: I376235de8a8569e63530eca914dc977a670a769c
(cherry picked from commit 4f1ad8016e11d5440127b45c48854c1ed2cf75aa)
2025-09-10 09:22:19 +08:00
xun.zhang
555e9e3ded
ENH: update process profile for H2D
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia157b81ad03083a34b7456998625682b6b69e6fc
(cherry picked from commit 2c1bcde53de8e125991307e653c49faa1c7430c7)
2025-09-10 09:08:34 +08:00
xun.zhang
d674f49855
ENH: modify nozzle diameter sequence
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia17f86e3f035ad9389d0f44f8378c822f8cc947e
(cherry picked from commit d3927a59e99ab5fc484934703d4eb08b0e728179)
2025-09-09 17:16:54 +08:00
zhou.xu
632281fcc0
FIX:update left_extruder_only_area.svg
...
jira: none
Change-Id: I00728c87faf75a24233edd5f9ba1595b1fe2617a
(cherry picked from commit 5bd6cf87e271a40326153fb0614b33178e16a0c8)
2025-09-09 16:52:37 +08:00
xin.zhang
6c57be89d2
FIX: update HMS files supply for duzhong
...
jira: [none]
Change-Id: I93bb103d4fbebe3f35986a0c08147614b62cfc00
(cherry picked from commit db6f52187bd5d38ed22cdbbe95f798427f941549)
2025-09-09 16:52:31 +08:00
xin.zhang
e0940cb3e9
FIX: update the HMS resources
...
jira: [none]
Change-Id: I3a6c02a559b6d660b325a49d551f4ca8139885bc
(cherry picked from commit fcb8e8deaf2eeaa7a2f4b321231b46ae87873d4f)
2025-09-09 16:51:07 +08:00
xun.zhang
ed6f2eb39c
ENH: update some params for filamnet in H2D
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1171dbf41f840bb0a59045c70a811a5da2bbd694
(cherry picked from commit 6b13655f9dbd87d1f1bf0f0d62346b2043e3890d)
2025-09-09 15:41:33 +08:00
xun.zhang
19b466ccf0
ENH: add global map mode tag for pop up
...
1. Add tag to mark the global map mode
2. Fix some wrong usage of bmp in code
3. Fix display error in dark mode
jira:STUDIO-9729
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Idb36a5022c403e02c26d7fe23a95dd6877deca90
(cherry picked from commit 5a2abf7e211327cde57717b5ab7b79b63c967bbd)
2025-09-09 15:40:26 +08:00
zhimin.zeng
ccc52c20c9
FIX: modify the H2D picture
...
jira: STUDIO-9592
Change-Id: I18a8a75ee77bf828bf148c4f7d49f6603141789c
(cherry picked from commit d3f9723349dbbb3194a45a125e94065fc7d87924)
2025-09-09 15:37:41 +08:00
chunmao.guo
b1b9c02368
FIX: something gui
...
Change-Id: Ia5ed59d2acca441030a917ae6867cca70bb2231f
Jira: STUDIO-9705, STUDIO-9714
(cherry picked from commit 7bf976babc8d12118200c5ebe8f1df976d269199)
2025-09-09 14:41:24 +08:00
xun.zhang
a7578be62f
ENH: update gcode for H2D
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8b33061aba2ba142bc435c56148e3a5ac500e413
(cherry picked from commit 17706151445e94005ccad956c473daee0b576aa7)
2025-09-09 14:41:24 +08:00
zhimin.zeng
6ab141e0e1
ENH: add PPS-CF/PPA-CF detection for multi-extruder printer
...
jira: STUDIO-9660
Change-Id: I1df024e178b8561569b493888d6057d8f96aea3c
(cherry picked from commit b68a7b3bd6ad5c980885fbaed3c635ae1a424f73)
2025-09-09 14:41:23 +08:00
Arthur
0c27260cda
ENH: set H2 series' best_object_pos to 0.3x0.5
...
So objects are auto arranged near the chamber fan.
jira: none
Change-Id: Ia7c76c0b048fad51728d2b24c9dd6530c8c30497
(cherry picked from commit 0f37893bea4961e1461df0c55bb4ad95bd4fb17f)
2025-09-09 14:41:23 +08:00
xin.zhang
cf90949a34
FIX: update the latest HMS resources
...
jira: [STUDIO-9617]
Change-Id: I39eacc70067e58916b16433031fdc69af7b379f3
(cherry picked from commit 48c7d6b77018946db3246e4cbfaf0a81a0ec009f)
2025-09-09 14:41:23 +08:00
xun.zhang
56d40ca24f
ENH: refine time estimation in filament change
...
1.Add sync command. Now gcode and dirrectly add time sync command
2.Add support for ceil and floor in placeholder
3.Update change filament gcode for H2D
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6dd97cbd96bae1c2751c08357ff64947876d7471
(cherry picked from commit c99fcd454c2499b0c0e3ed9402a2182c00a9bffa)
2025-09-09 14:41:17 +08:00
xin.zhang
f8cd89fdee
FIX: support internal HMS
...
jira: [STUDIO-9617]
Change-Id: I5c073966244171a85f43e4bb014b02c00886fef3
(cherry picked from commit d5a8675badce0400dde4e3a2e9956c65d8878cf2)
2025-09-09 11:24:16 +08:00