Commit graph

3203 commits

Author SHA1 Message Date
tao wang
1241b66dfc ENH:fixed incorrect prompt for glow material
jira:[STUDIO-10574]

Change-Id: I4475eb527ffbc8cc6d72405445552971d062b45e
(cherry picked from commit 01918affdfb69879f86ca47fe2f1ab8af5e1311b)
2025-09-17 17:09:21 +08:00
xun.zhang
5c406ef00a ENH: new wiping dialog
1.Enhance performance and ui display

jira: None

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If1cde4d1a17437ee5485dd51adff4c3444774ffd
(cherry picked from commit 9c28c320d680d69b16d4895fda1bdcab9ad5b18d)
2025-09-17 16:57:35 +08:00
xun.zhang
6895cbcc58 ENH: update gcode for H2D
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3de9ef68ef727d58adac5c6025e50d1fa318177b
(cherry picked from commit bc446854ff5d20c152a5858958c643e903081895)
2025-09-17 16:27:34 +08:00
zhimin.zeng
bde94a6616 FIX: the timelapse gcode is not generated in spiral vase mode
jira: none
Change-Id: Ibb73fab7f51e5a81bd32b6e5df18a095f2aa30d3
(cherry picked from commit 22499a552e86f6f458706c3043915130b447de2c)
2025-09-17 16:27:22 +08:00
xun.zhang
6f5ea725dc ENH: add new way to set bed temperature
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I99a9f67e9b13b2137ad371b22cf0999ccf9c096d
(cherry picked from commit 69c2947daf66eb0a6732b1b980c9b87f597c8da7)
2025-09-17 16:22:05 +08:00
xin.zhang
0099823501 FIX: support save remote file to storage
jira: [STUDIO-9095]
Change-Id: I675d942b52e723908a5be1861efe7917cdcc599d
(cherry picked from commit 5850bc8fbd0dd6e757e48e54275c1788e15ff93e)
2025-09-17 16:10:44 +08:00
xun.zhang
c8bf1cedcc ENH: update profile for H2D
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Icd5c507c6e9db4a74f68389a9b7ac476679fcc5f
(cherry picked from commit 0f6d691597d77725d7a3a4a3ae34d010c5d1cb58)
2025-09-17 15:49:03 +08:00
zhou.xu
7b282924e1 FIX:update svg
jira: none
Change-Id: Icd74c1fd1eee3c04ea6caaaab96c990dc64bdcdf
(cherry picked from commit cb5c007d284dcc72adcb7364cb0660da8bfeee6f)
2025-09-17 15:49:03 +08:00
xin.zhang
e53337ded4 FIX: update HMS files
jira: [none]
Change-Id: If1124ce837984b4d5926a3b20b1419b3b8f5e1cd
(cherry picked from commit d7bc191cd38208630a1b3db2da40608395ded34d)
2025-09-17 15:49:02 +08:00
zhimin.zeng
44624274f5 FIX: Cali thumbnails distinguish left and right nozzle
jira: STUDIO-9747
Change-Id: Ie28901288c166cdcd7403311cb467b72453c2ca4
(cherry picked from commit 0b3cd958d5b573276488c477540b122f116099ab)
2025-09-17 14:17:13 +08:00
xin.zhang
155d42bb0e FIX: update hms files
jira: [none]
Change-Id: I57633250f1abe12c6a8e0b647965eacce94ddec3
(cherry picked from commit 5b4dcfdaa7369d3ff22eabb9fb81e7ac551686f1)
2025-09-17 11:34:21 +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
xun.zhang
c6b34b22dd ENH: remove bambu tpu 85a temperoraily
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie45b497ad5a838a45e819467944775ffaaf955fa
(cherry picked from commit 853f899500f1fa103dfd3078bf42e656af7d1a57)
2025-09-17 11:13:11 +08:00
xun.zhang
022a67836d ENH: add profiles for TPU 85A and 90A
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ica88ced8d2e0dbb1bdff0d4b80863bd98102ff16
(cherry picked from commit 8d10dcd046ebcb4d78962d7796ebec0d58776bc0)
2025-09-17 11:02:20 +08:00
zhou.xu
80f92e4640 ENH:add scroll for SyncAmsDialog
jira: none
Change-Id: Id1a6ea1107b8672182f86e16f2093b661d8f8966
(cherry picked from commit fceb5ec5aa0248787abc362bdb8f2bf2b9c135c0)
2025-09-17 10:44:26 +08:00
xun.zhang
58fda108a4 ENH: remove unused keys in profile
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ib54b300a3c10ec45acf4aa842c1162bad5bdb289
(cherry picked from commit ff37dbdf7969fc446ee2dec9db4f04983e62915c)
2025-09-17 10:28:04 +08:00
xin.zhang
ce8ca8f05e FIX: switch the image
jira: [STUDIO-10459]
Change-Id: Ibe33c0cdf208b898295dfcead8c45063c051860c
(cherry picked from commit 0ea2a8dabe35521146321da674b8afec3d3fffcf)
2025-09-17 10:21:16 +08:00
xun.zhang
7779a2aaa9 ENH: modify filament config for petg hf and pla basic
jira: None

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I46528a07a9e1d3f7422106636b405022811d78e6
(cherry picked from commit fe9073696da03ed8c9fae2ab24d579477cea0e3d)
2025-09-17 10:21:15 +08:00
xin.zhang
d5661a89e6 FIX: update the ext images
jira: [none]
Change-Id: I3138fcfa124127672da982fb6e761492ccd98ea6
(cherry picked from commit 0deb17f43e18bb06be9d294f805cf1d865c7f707)
2025-09-17 10:07:53 +08:00
zhimin.zeng
a0b5cdfbb2 ENH: generate framework for all layers
jira: none
Change-Id: I95f35ba45fe9f544c53bdf0c5a52a70bd45ee7a9
(cherry picked from commit 3e0b6eb2289eab383c6e616d37559b0c6619eca1)
2025-09-17 10:07:27 +08:00
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