Commit graph

3183 commits

Author SHA1 Message Date
xin.zhang
797c2cca4a FIX: update HMS
jira: [none]
Change-Id: If64f38fe2d8bad68799f251d0045ede52098693d
(cherry picked from commit 970d176cf7666770abc77c3dbd48f4b2c788e8d8)
2025-09-17 10:04:51 +08:00
zhou.xu
b683661a45 ENH:Optimize interface display in "sync ams" dialog
jira: none
Change-Id: I51e8a55491112653e8e55eed0d6c93c6a37dcbe0
(cherry picked from commit a7ad6dfac4fdd013193680a728a90775e6bdf7a3)
2025-09-17 09:48:41 +08:00
xun.zhang
68fc82097c FIX: h2d do not support timelapse in sprial mode
jira:STUDIO-10402

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I5d012a4665bf5715d90fcb973a589d3a500ded13
(cherry picked from commit 82d13205d574039c9478a92114c07a505c26773d)
2025-09-17 09:46:18 +08:00
qing.zhang
348f59ac67 ENH: update H2D filament retraction of matte
Jira: 9900

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I9e8f962796b7301fff7c8ae4e74db548771bd14e
(cherry picked from commit 09c0b004cd4c0b3c97c550c4e5f9704c1d118020)
2025-09-17 09:27:38 +08:00
xun.zhang
686825b584 FIX: missing gcode line caused by gcode GCodeEditor
In the original logic, the gcodeEditor did not parse gcode lines with
leading spaces. In recent changes, all leading spaces in gcode lines
were removed, causing all gcode to be parsed. However, some certain cmd
perform additional actions, leading to incorrect state recording. As a
result, based on the erroneous state, some gcode lines that should not
be deleted are being removed.

This logic needs to be optimized in the future.

jira:10357,10367

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If34b9c3b2913768b824030685e0a36708ca3a5ca
(cherry picked from commit 16813aa46092343c70681f3145a4f402ff415042)
2025-09-17 09:07:07 +08:00
Mack
2db3c63b7b ENH:change filament icon to rect
jira: STUDIO-10344
Change-Id: Ie71f83b7c78b4784e1824c52e61485e8f4d36e1e
(cherry picked from commit 964a6c8320928278251e857283810dfd7a309618)
2025-09-16 23:01:55 +08:00
zhou.xu
87f540b1e5 ENH:show big bed image
jira: none
Change-Id: Iaf3529345f688f2dbdc35c16f45253a5b65feb84
(cherry picked from commit 5e2861acca8d86d6e7012f73d3f739877eb05069)
2025-09-16 22:59:32 +08:00
xin.zhang
d999107d49 FIX: the dark mode n3s SVG center is not empty, which will cover the AMS color
jira: [STUDIO-10308]
Change-Id: I67c5bdb753abfe9fa233e427a7b518c2fad4fd01
(cherry picked from commit 0730c4ec51e859f5ba7474c64edfaac657dc69de)
2025-09-16 22:57:47 +08:00
tao wang
074a9c1bba ENH:update options ui when printer does not match
jira:[STUDIO-9973]

Change-Id: Icca959d732f98e34b0a83fc2971c70b64d393d75
(cherry picked from commit e7454fa47d09c529db3262faf19e2e2f22bdb5d7)
2025-09-16 22:07:26 +08:00
qing.zhang
01c2a31ac9 ENH: change param name
Jira: none

change filament category to filament adhesiveness category

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I267d71b2f968becf4e8f434daafdf1a70c36a823
(cherry picked from commit faec4160d560d965978447eaa8675a5fbee4090c)
2025-09-16 21:56:37 +08:00
xin.zhang
6d04854a98 FIX: add images for filament load steps
jira: [STUDIO-9850]
Change-Id: Ie3f3dfbda3d7bc2e1e8c8bab4c9a5f2168536e53
(cherry picked from commit 89efa6cb272e11a0ee79f9713b537ff68009e44f)
2025-09-16 21:48:30 +08:00
xin.zhang
078fa9d220 FIX: update some printer define
jira: [STUDIO-9850]
Change-Id: I5dfd8b7711ec3db96b7fba75a9a97bd4852db63c
(cherry picked from commit 6be2379a044e51e9a18075944e24459d6d0311b7)
2025-09-16 21:47:15 +08:00
Mack
0581ddd0ba Fix:filament svg icon error
jira: STUDIO-10223
Change-Id: I93f805cfa7780e666b4e2f2430c4fcdfa3de0c8a
(cherry picked from commit e288462439ddf34db0bf10b55970d07ded662ccb)
2025-09-16 21:43:53 +08:00
xun.zhang
ad740bde86 ENH: add more process profile for H2D
jira:none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia0b3534e6e00d7f231cf759b0045473a3fb66526
(cherry picked from commit e2f25326c1c3cac8241773c94f4cc5b128d68cdb)
2025-09-16 21:21:39 +08:00
xin.zhang
744d991ae8 FIX: update some hms files
jira: [none]
Change-Id: I419d389fe74038919ca4e17d407e404636062b76
(cherry picked from commit 075d04ad4a16bdc56f085831f0971bbaf988e0a6)
2025-09-16 20:10:46 +08:00
xun.zhang
1db0f6d663 ENH: update timelapse for X,P
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I32c8288511da98cc1806697673b476b17556164c
(cherry picked from commit f2d9902ff3a79ab5729689bd8361d14f7af59a84)
2025-09-16 17:30:05 +08:00
xun.zhang
1275341149 ENH: add timelapse for A series
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9028d7117d1d184a8f7baad0b0ae4492a35481f4
(cherry picked from commit 1c8da5f99cebf5e647ed8d65c93b6893b8342cbe)
2025-09-16 17:29:09 +08:00
zhimin.zeng
b396d50d59 FIX: Detach the timelapse gcode from layer_change_gcode
for X and P machine
2. remove lift and retract in filament_change_gcode and layer_change_gcode
jira: none

Change-Id: I3da2d3ac7f0100d1963dcbb1228323666a060534
(cherry picked from commit 5c3d804b9fbe65532d2717e60b5f1143710b0ecf)
2025-09-16 17:17:41 +08:00
zhimin.zeng
2608d4a66e FIX: enhance for timelapse gcode
1. support traditional timelapse for H2D when printing by object
2. insert timelapse gcode when close wipe tower
3. remove hard gcode before filament gcode
jira: none

Change-Id: Ib56c21b1f07832f2cbc8ba5ab7f2e8653b3105bf
(cherry picked from commit 7613474cefd210685d16a5585608c0c7cb7efa95)
(cherry picked from commit fff787345625a0031934e609b1b3709e39decd4a)
2025-09-16 16:56:24 +08:00
zhou.xu
5667d9a402 FIX:fix display in mac
jira: STUDIO-10130 STUDIO-10062
Change-Id: Ie98b19cdd3ead958940a8730e6091fc74be05ad8
(cherry picked from commit f5133d9d431ee562148afb1488ddab24c911c16d)
2025-09-16 15:39:36 +08:00
xun.zhang
4b429af8f2 ENH: set default nozzle volume type to standard
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia7c0118f89aee4e55c4c4b466957d80453775237
(cherry picked from commit a780ed9e1d4c0cea723c1107229649a8fbeb1e51)
2025-09-16 15:36:42 +08:00
xun.zhang
b9af995651 ENH: add virtual nozzle temp command in H2D gcode
jira:STUDIO-10104

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I47b083384e6730cf973dc865e821dce3a7e46277
(cherry picked from commit 8e48e10f51a77345fc6da37417af8eafeaae3f8f)
2025-09-16 15:36:32 +08:00
zhou.xu
30731cfd54 ENH:add "not support bed type" function
jira: STUDIO-9028
Change-Id: Id1c6cc9005fc5073d885274e360d31282063a9a3
(cherry picked from commit e74c9e710b4bed97e637c8197052b5bd864bfc95)
2025-09-16 15:36:16 +08:00
qing.zhang
b12b9c0fdd ENH: add filament category
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0f31a376527bc540d27c49908712d08bdba3d719
(cherry picked from commit 3f2f704676f0a8a6cf1e43e8b32fd999bcc59d31)
2025-09-16 15:00:44 +08:00
zhou.xu
6c002687e0 FIX:update bbl_bed_pte_left_bottom.svg
jira: STUDIO-9954
Change-Id: I93a808651a84b6fa30de608a7e21d5ca722f200c
(cherry picked from commit 492033182c2795b7798c1a57f80c0e7b9ec08cc6)
2025-09-16 14:47:26 +08:00
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
Some checks are pending
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