xun.zhang
e42556f835
FIX: collision caused by pick safe pos in object mode
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Ic9a45e314ffa1115854736516cc06dfd976c28f9
(cherry picked from commit 04d90ac16d3abc481860a46b2d8bc8cd2f599aed)
2025-09-24 13:12:55 +08:00
zhou.xu
adeb3ab3f7
FIX:Fix the issue of importing GCode array out of bounds
...
jira: STUDIO-12389
Change-Id: Id7995558bf0e297e2360b338ffbf63d93efa38f0
(cherry picked from commit 6d15a9005769a7dbfb96bb28ce6b57e55bf1c435)
2025-09-24 11:18:23 +08:00
zhimin.zeng
fa8280f065
FIX: The print_z of some layers is incorrect after slicing
...
jira: STUDIO-11989
Change-Id: Ia0488d8270a7880d3f019d757cde7ce2f591713d
(cherry picked from commit 9bd47ef3e59b5518cd049182890c1d557c69b710)
2025-09-24 10:40:45 +08:00
xun.zhang
a6084d01bd
ENH: add placeholder to check whether filaments is BBL
...
1.Also add some side texts
jira: STUDIO-12308,STUDIO-12309
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I16f21d001cf0c87620a8d7c93b33af4f63981624
(cherry picked from commit 31451dcd3310720692ec2748962f379ac3c50cf4)
2025-09-24 10:40:45 +08:00
Noisyfox
580414265d
Merge remote-tracking branch 'upstream/main' into dev/h2d-2
...
# Conflicts:
# src/slic3r/GUI/Tab.cpp
2025-09-24 09:15:33 +08:00
xun.zhang
d9b68c6eef
ENH: support curr extruder in timelapse gcode
...
jira: STUDIO-12119
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: If8fd91a6a1d54d3c5f4430c7f5c06685792c3a8e
(cherry picked from commit faacd23e3fba22b290e6fd47bce9de704c1165a1)
2025-09-23 21:39:51 +08:00
xun.zhang
1e9d825dbb
ENH: remove the limit for number of tpu filaments
...
jira:STUDIO-11995
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Ifd3ff7bf870570f9691b7008d8ca6ee8245c046d
(cherry picked from commit cd3219e6654d126363c04d0135bece62dcf94e39)
2025-09-23 21:32:18 +08:00
zhimin.zeng
8f97d9bbc3
ENH: Optimizing the shape invalid condition for wipe tower of multi-extruder
...
jira: none
Change-Id: Ic80a83088f409f0c4d4444c085befb6a1817c85b
(cherry picked from commit e22d328fa9d1682c00617a4cad0498c67a7512f4)
2025-09-23 17:30:36 +08:00
xun.zhang
44e62213e9
FIX: potential collsion in by object seq
...
1. update the expand length
2. enhance rod collision detect
jira:STUDIO-12199
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I1350ef5612b833405928e22c542a7a6f0c671105
(cherry picked from commit 7a197af3e0aa6d6c1493768d757ecdc938e49c1d)
2025-09-23 17:22:10 +08:00
xun.zhang
5e8272b0cb
FIX: support flush params in machine start GCode
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I7566b960421b088f1d122936d9bc3974057a1e6b
(cherry picked from commit dd796026b3f869cfc40e8d9c5769c2a40e565441)
2025-09-23 17:12:51 +08:00
xun.zhang
7bd4f85a96
ENH: add params for filament retract when extruder change
...
jira: STUDIO-11965
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Id175e9dbce419d43cf45d6116ed4fa4fd556f606
(cherry picked from commit c7964441719f521d1a20dc9f084a7598bd01a9a5)
2025-09-23 16:38:50 +08:00
xun.zhang
cdf66984dd
ENH: add flush params for multi filament
...
jira: STUDIO-11965
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I2245f22a03c65b570bc60a2792daf4c1683f1ebd
(cherry picked from commit ffe2653341bffd5aee42436e236d45e0b87b56aa)
2025-09-23 14:16:03 +08:00
xun.zhang
3064da3ed7
ENH: do not reslice if only notes changes
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Ibcb33b981af691c1521041251df9e1c158d26e0c
(cherry picked from commit 43531ed01e7dfa28a649227471cf283a33b38959)
2025-09-23 08:58:51 +08:00
xun.zhang
ce81f03b6d
FIX: avoid collsion in by object mode
...
jira:STUDIO-11625
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: If5957a919af606934a34aa942f54dc4e7650a7f9
(cherry picked from commit 476c17819fe2e4fb7891b4b46865dde1a0057f33)
2025-09-23 08:55:31 +08:00
SoftFever
b483dff617
Enhance GCode handling for Z-axis movements ( #10803 )
...
* Enhance GCode handling for Z-axis movements
- Updated `travel_to_z` method to include a `force` parameter, allowing forced Z movements.
- Modified GCode generation logic to ensure Z position is restored after unknown last positions.
- Enforce z restoreation after tool changer
* Improve filament_multitool_ramming logic
* fix indent
2025-09-21 22:03:54 +08:00
xun.zhang
3e8ca38990
ENH: refine filament sorting when flush volume is 0
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Ia012cbd7a45a2fead94d2c579106115ea8edb5e8
(cherry picked from commit 6c1be5bddca79bc9a3bf536277d46cfc7fe20ebe)
2025-09-21 18:01:16 +08:00
xin.zhang
e758b77ab7
ENH: add some check job
...
jira: [STUDIO-11883]
Change-Id: I9a112b10b18d4c4f4bee5c8076b22f46fb63b13f
(cherry picked from commit 15c7bb729085ec65fee8cc36a5058ac5e883ceb8)
2025-09-21 16:25:57 +08:00
chunmao.guo
d31c4427aa
ENH: printer nozzle diameter select
...
Change-Id: Ibf8b74e1f93a7c387db3f0fb5e6e733165322322
Jira: STUDIO-9140
(cherry picked from commit c990314567383d3bfff72ac11df6471e0a10f315)
2025-09-21 14:37:37 +08:00
zhimin.zeng
119f16c565
ENH: add filament_printable and delete unprintable and printable list
...
jira: none
Change-Id: I643ab11831ceac1fe0793510f64b288cbd16415a
(cherry picked from commit 3dd5a601547485bfcc4188727343a52c30bb6a73)
2025-09-21 13:48:08 +08:00
zhimin.zeng
0926dc46fb
ENH: add printable filament types for extruder
...
jira: none
Change-Id: Ie6ada223bc11a53b975c8c20b4a41e7cdc2d524c
(cherry picked from commit c64270f506a4d004f66aef3ff31760f793eca489)
2025-09-21 13:48:07 +08:00
noisyfox
eb75a325ca
Fix build error when PCH is not used
2025-09-21 13:48:07 +08:00
Arthur
b965d420cf
ENH: do not reverse wipe for supports
...
This might help improve the quality and strength of supports.
jira: STUDIO-11985
Change-Id: I51644c84b9ede018a08a0f2b8fdca5d271d69991
(cherry picked from commit ba5dbc544b65276d772834305fcca6b5f7536d6e)
2025-09-21 13:48:07 +08:00
zhimin.zeng
9744d93406
FIX: Add protection to prevent inf use_m
...
jira: none
Change-Id: I37b4a032c0504200b4b97c3d63744ea7e5962b66
(cherry picked from commit 94b6e7b78b34e2f225ef7361d3a9251d05da6de2)
2025-09-21 13:48:04 +08:00
xun.zhang
425cb8b52b
ENH: speed up timelapse pos pick
...
1. Cache the bbox of object
jira: STUDIO-11625
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I4682cd5fe2aef1dc5cd5fd6be33425c7095263eb
(cherry picked from commit 07516d1fecfff7719a60f2c5730bfcbe1958299e)
2025-09-21 13:48:04 +08:00
zhimin.zeng
01ec351df4
FIX: error retract length of prime tower
...
github: 6733
Change-Id: I83cd50b9054de887a89389ccbeeb9fbc6de679d6
(cherry picked from commit 6d2f21ef4c51beab4b614a9ad5f489c8bac742fc)
2025-09-21 13:48:04 +08:00
zhimin.zeng
4a282fd61d
FIX: fix the error retract_length_toolchange for multi extruder
...
jira: STUDIO-11916
Change-Id: I3e9c0888d2b15046f76ccc8ac063080df35c3290
(cherry picked from commit 13df84d0ae21d95a03b2ea951f40cd39293e3afd)
2025-09-21 13:48:03 +08:00
jiangkai.zhao
8e616ce892
ENH:add flat_irong as print preset
...
jira: none
Change-Id: Ic29634780e1ece2d0cffddd0c2cf7cafb1318fa2
(cherry picked from commit 2acd313f72d5e9531cf1394c218dc3bc6b8d9521)
2025-09-21 13:48:03 +08:00
Noisyfox
2cea19bdcd
Fix build error caused by cyclic include
2025-09-21 13:48:03 +08:00
xun.zhang
b5756d1702
ENH: add timelapse pos picker
...
1. refine code structure
2. prevent moving tool head between camera and object
3. consider raft layer
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Ic0004791bfd4036d4323045a041709d861e5c8d0
(cherry picked from commit 7dc269f99473421162ad89c555bfac7ace0e9a6b)
2025-09-21 13:48:03 +08:00
xun.zhang
01673d1fef
ENH: add filament map and filament list in GCode head
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Id214bcf5f76e6c59d4b8bcb55583f96b347630bf
(cherry picked from commit d1e6680f4c19ae19e8328813528f21e63084e577)
2025-09-21 13:48:02 +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
zhimin.zeng
e993a4cab8
FIX:Incorrect filament used for extruder with support filament
...
jira: STUDIO-11670
Change-Id: I7c5da8280cdc31c5910cd42333654db7673265c7
(cherry picked from commit 5b0b04815e6cff0d119328e780e4183a6ed479c5)
(cherry picked from commit 4364a4ecca47c96ebb39a4a7eacefb50ef6dd932)
2025-09-21 13:48:00 +08:00
xun.zhang
fa05f107ab
ENH: refine check logic for filament mix printing
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I199462cee6284e13e58f829b7972dd3124bfc385
(cherry picked from commit 22834b23586d2230e94e9dffd8b09146e5342246)
2025-09-21 13:47:58 +08:00
xun.zhang
86f16d9c8b
ENH: add some missing filament types
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I6d5b8f7a3c2eb26950bf39694023903ddbc47088
(cherry picked from commit 14eb79ab9a02d73f5e6deea8f7dc77897e76ac7e)
2025-09-21 13:47:58 +08:00
chunmao.guo
b64d05608b
FIX: not transfer filament param copy variants
...
Change-Id: I2fea8a692506ce8c1def6ec4700c788fa31cf7be
Jira: none
(cherry picked from commit ad049d1a90b9bbd7b8c9d4cb9d32f013d6ad3de9)
2025-09-21 13:47:57 +08:00
zhou.xu
59e211a4e1
FIX:add exist_multi_color_filment logic
...
jira: STUDIO-11477
Change-Id: If30e0289096b6d465eace503fbe706fb31742f0c
(cherry picked from commit 1ace58b950de660bf7eac64bab77b0091d95a0c0)
2025-09-21 13:47:57 +08:00
xun.zhang
69be743c68
FIX: incorrect flush volume after sync ams
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I44d031b1fdcc02adbfc4346314f5001c56a941b8
(cherry picked from commit e854174bc0d2f9965f11da9860f67ce5996e99b0)
2025-09-21 13:47:57 +08:00
jiangkai.zhao
91ee2cdbc2
ENH: update param's mode and tips
...
jira: none
Change-Id: Ifb266f47e849f431ca92104249a5328d26734808
(cherry picked from commit 96516e8c042692ded35443bb40ae86f48e1264ae)
2025-09-21 13:47:56 +08:00
xin.zhang
377df07c67
FIX: default cal_idx is -1
...
jira: [STUDIO-11448]
Change-Id: I6f37bc7d095a1d25f4f52db9d34954d2dccf1576
(cherry picked from commit b9cb321f733656e91936ced34930b1df10f477b0)
2025-09-21 13:47:56 +08:00
chunmao.guo
d2754f4c36
FIX: sync_ams_list find filament_type
...
Change-Id: If6d95c26fa128377d8b4414470b07ed5a40f0b09
Github: 6152
(cherry picked from commit f076d95d8847d80ed466d118d718ec7584293e97)
2025-09-21 13:47:53 +08:00
Mack
5004fbbf60
ENH:loading the step in boost thread
...
github: #6079
Change-Id: I0a289fc9730e7d091a71137cf11a711dfee5392f
(cherry picked from commit b454e7d8bb91b62b3be6121c567f7aee291eff50)
(cherry picked from commit b7ffba39e407317ad3cc4fe65d220f0049963aa9)
2025-09-21 13:47:52 +08:00
zhou.xu
8b2d727edd
FIX:Plugin first fails to install Mac
...
jira: STUDIO-11242
Change-Id: I9c3484e18c3da75a5dee62523e32ac6ad6c9b207
(cherry picked from commit d5d4dc46386894b636c189da15978df11f8393c0)
2025-09-21 13:47:52 +08:00
Mack
ee169528c5
Fix:Retain the brim ears during model merging
...
jira: STUDIO-10122
Change-Id: Iae35e4137f64a6d697b90bf76f0e6fbc4d8025c4
(cherry picked from commit cf5a2c9046490a1f34346713947b0e016f127b07)
2025-09-21 13:47:51 +08:00
jiangkai.zhao
f3c11288f6
Fix:skip_point error when gap overlap
...
jira: STUDIO-10852
Change-Id: Idbfdfe2513115b0fef540e0d681997be0a3719a4
(cherry picked from commit baae89db17b7a59858d7760d6bfc394fbdd8c252)
2025-09-21 13:47:51 +08:00
jiangkai.zhao
e7f95ae1af
Fix:False positive in collision detection
...
jira: none
Change-Id: I4f2c88ac95273086e2f77e60f5856415aba83741
(cherry picked from commit 93e8f29e5d683e2949310b3037b1d90f3eeeab0b)
2025-09-21 13:47:51 +08:00
zhou.xu
4b7f245740
FIX:fix obj import crash
...
jira: github 6333
Change-Id: I3df9edce95b24751f39bcdcbe75e7050fede68a1
(cherry picked from commit 46678882ed2630f3e4593fa4176cec64e8e5ed13)
(cherry picked from commit cb5ac14fd3f111d522696d418d1c175dce88904c)
2025-09-21 13:47:51 +08:00
xin.zhang
38a71f527e
ENH: move some level
...
jira: [none]
Change-Id: Ibd0d380b16b30f63144d38a0c34972d8b7c4153f
(cherry picked from commit 2da69efd9b0db6c2be6a1b3985bbafb7afc5d3be)
2025-09-21 13:47:50 +08:00
lane.wei
833108d29a
FIX: 3mf: fix a popup issue while parsing old 3mf
...
jira: no-jira
Change-Id: I89f0b83f146bea60ef821160254cee4d2c0eb0ca
(cherry picked from commit 5f1714f02ceeb34519e0ec401d37be3ff7efa87b)
2025-09-21 13:47:50 +08:00
lane.wei
c2fea83e72
ENH: CLI: add allow_mix_temp option
...
jira: no-jira
Change-Id: Idff6ff2f11b4b0a1fb3a4a410fa46c78d38d1a6e
(cherry picked from commit 4ffa7b505a4c1b1f27152c5f5198c9571939de40)
2025-09-20 15:37:12 +08:00
xun.zhang
782c7f1d0c
FIX: filament savings not consider flush multiplier
...
github:6214
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I9cb9f8d172bfa501732bb50f437e261793e18972
(cherry picked from commit 274a05367313daac913e58b98dd8944e934ebabe)
2025-09-20 15:36:49 +08:00