sync codes to 2.8.1.55#11547
Merged
Merged
Conversation
修改器的涂色在切片时被忽略，实际使用的始终是 volume 自身的 extruder_id()。但 get_extruders() 在所有面被涂色（has_0=false）时不会将 extruder_id() 加入耗材列表，导致该耗材未被注册。GCode::do_export() 处理修改器区域时访问未分配的耗材槽位，触发 Access Violation (0xC0000005)。 修复：非 MODEL_PART 的 volume 始终将 extruder_id() 加入列表。 github: #11152 feishu: issue-7019358173 自测结果: pass Change-Id: I70e79859b3d59cc8a73c3a093ff333d3e993bf37
feishu: none Change-Id: I7dae58e6e6defd8205bff6f8e3c36c1bc4c82ca2
A2L 快速模式 增加 WIKI链接 JIRA: none reason: other 自测结果: pass Change-Id: I4f5ef3764adda71d0fcc34c83e1e782ac45a4604 Change-Id: I5f06a8ef66b486bc784b938d5fd9e5b81e0cf470
The old percentage-only threshold lost valid candidates when scores were small and accepted too many irrelevant ones when scores were large. Use max(absolute, relative) so the AMS post-selection has enough candidate diversity without unbounded expansion feishu: story-7026776530 Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I2291a137ae0088eb8b07f4b0c5aea98a52bb8f96
JIRA: STUDIO-17843 Change-Id: Ia43d1f730f93d3cad5490ab687102abd43cbedd6
1.Fixed the error related to maximum painting data 2.Fixed the issue where arrows could not be reselected after being shrunk 3.Added a task cancellation prompt when exported files are occupied by the system 4.Optimized the workflow: click blank space to exit editing after double-clicking a tab 5.When clearing a text box with more than two lines of content, revert its height to two lines 6.Enabled the Assembly Tool for use within assembly steps without affecting the final assembly result 7.Added support for selecting items on the canvas and locating their corresponding entries in the Add Object tree jira: STUDIO-17763 Change-Id: I782aacecb625d215c7905eb32fa2730e287d0680
feishu: none reason:[support printer field] Change-Id: I9a510348973f399c0d4ab9497d68bcce7550c999
…tiline on macOS feishu: issue-7028832374 Change-Id: I0680c5c5d1239f25bf753033ae116e0acd0c37c7
…and a draw_crisp_large_text feishu: issue-7026671605 Change-Id: I57a106249eec4a5bcca8d6d24a2328c69bf0db12
feishu: issue-7022935542 Change-Id: I119e4459a66e56107572b583d613fdc4de8af1b6
Different AMS units (standard AMS / AMS Lite / N3F-N3S) have notably different filament load/unload times, but slicing could only estimate one set, so the predicted time was inaccurate for multi-AMS machines like A2L (N9). Changes: - PrintConfig: add printer options ams_filament_load_time / ams_filament_unload_time (Floats) and selected_ams_type (Int, -1 = unset). Both time arrays are indexed by the AMS type enum value; a mirror enum AmsType (kept in sync with GUI DevAmsType) and helper get_ams_type_name() live in libslic3r so the backend needs no GUI header. N3F and N3S share one time group and map to the canonical name "N3F_S". support_ams_list is no longer a PrintConfig option: it is device capability data and is read from the printer model JSON (N9.json) by the frontend only. - GCodeProcessor: resolve_ams_filament_times() picks the load/unload times by selected_ams_type (array index), falling back to the legacy scalars machine_load/unload_filament_time when it is unset or out of range. Accumulate per-filament load/unload time into PrintEstimatedStatistics. - ProjectTask/bbs_3mf: FilamentInfo gains total_load_time / total_unload_time; PlateData gains selected_ams_type and ams_list. slice_info.config exports per-filament total_load_time / total_unload_time plus plate-level selected_ams_type and ams_list, written with canonical AMS type names (N3F/N3S deduplicated into a single "N3F_S" entry). - Print: add the three AMS time options to steps_gcode in invalidate_state_by_config_options so changing them only re-runs G-code export instead of a full reslice. - Resources: N9.json exposes support_ams_list ["AMS","AMS_LITE","N3F_S"] for the frontend; fill the enum-indexed time arrays and selected_ams_type for Bambu Lab A2L 0.4 nozzle; bump BBL.json version so the datadir preset cache re-imports. Backward compatible: legacy scalars are kept and used as runtime fallback; total print time estimation is unchanged, the load/unload time is only disaggregated for later per-AMS replacement. feishu: story-7005484581 自测结果: pass Change-Id: I7193c0e83b58bf1f27c674626c736860d33c5ff2 Co-authored-by: Cursor <cursoragent@cursor.com>
… 2026-07-01 10:35:06 Change-Id: I1c946fdd974016fdfb3d6f61b6e76b7f4a96d771
feishu: issue-7026626611 Change-Id: Ib82602845201a0057235977c572612e974da5ad0
为 MixedFilamentDialog 的双色和三色混色增加比例就地编辑功能。点击比例 标签弹出"数字 + %"内联输入框，输入值按每个分量最小 10% 进行钳制，并自动 重新分配其余比例： - 双色：编辑一侧，另一侧自动取 100 - value - 三色：锁定最近编辑过的两个比例，第三个取剩余值 将双色和三色比例标签统一为同一个自绘控件 RatioLabelPanel，使 hover、点击、 光标和 tooltip 行为完全一致；三色标签由原先画布绘制文字改为真实子控件。 内联编辑器在编辑时 reparent 到被点标签并隐藏该标签，保证 z-order 可靠、 避免标签残影。 JIRA: none reason: other 自测结果: pass Change-Id: I4f6a3bc9ea11801c84ae53929b19824f85ac0b48
… 2026-07-01 14:23:02 Change-Id: Ifaec975edeef9b7f0adb067c6a5d4e3437f72e5e
1. use the correct color in FilamentMapManualPanel 2. use color from filament_multi_colour instead of passed in from other places feishu: story-7028347771 Change-Id: I892cd52a86e0945bcea73c4406abda858beac732
Update slice result comparison tips to describe nozzle purges instead of generic changes, avoiding ambiguous speed/result preview text. JIRA: none reason: other Change-Id: I7216b821b75d4137001e04bad954e2ebc0792555
04e2345bef 合入时在 Preset.cpp 误带入 sync_auxiliary_fan_to_second_fan、 default_wipe_tower_pos，但 github/01.01.00.08 未合入对应 PrintConfig 与 业务实现，导致 PresetBundle 初始化时抛出 Unknown option exception 无法启动。 JIRA: none reason: other github 分支 AMS 合入污染清理 自测结果: pass Change-Id: I3900d8334a6bfbd7c73ca37fcb92807b50cd5aae
feishu: issue-7031240118 Change-Id: Ie2692108e6d6afc05630bea713b91154335218f3
引入 nvtE3DHighFlow，使切片器能够识别并处理配置层新增的「Direct Drive / Bowden E3D High Flow」挤出机变体。E3D 仅提供 0.4 / 0.6 喷嘴规格，因此在侧边栏 UI 中，其他直径下会屏蔽该选项。 PrintConfig：定义 nvtE3DHighFlow 枚举及「E3D High Flow」标签，并提供无损的 get_nozzle_volume_type_string / _from_string 辅助函数 Plater 侧边栏：仅在 0.4 / 0.6 喷嘴直径下展示 E3D 高流量选项 DragDropPanel：将新变体归入高流量分组区域 (cherry picked from commit c7c0206da4ada075a3f371894013987afde65c19) feishu: story-6987549767 自测结果: pass Change-Id: I0349138b1ed15ab7e2f1d2188d4c3262e3e5298f
feishu: issue-7019853188 Change-Id: Ie1c03370866744b8c1abb64378b854004abd2827
The max_bridge_length parameter was not applied in the actual tree support generation. It was only used to identify and remove the corresponding bridge regions in 'loverhangs', while 'loverhangs_with_type' was not updated accordingly. Fix: Synchronize the updates to 'loverhangs_with_type'. feishu: issue-7034017839 github: #11317 Change-Id: Ic27a0162e8674c21a2859006eef95e6c05e5c007
feishu: story-7010888311 Change-Id: I3d89c690d28033a4d0212921bb5ae39a7f5aae15 (cherry picked from commit e1ff4290fcc269ab332748a9fe34614cd0de1e1e)
This reverts commit b7e4cb5acc07b7a4cb4c43b6d49336e3f390abd4. Reason for revert: <for e3d> Change-Id: Id7f729019376964ba4c401374f15a6683821e461
feishu: story-6987549767 自测结果：pass Change-Id: I824891210705277991fc786c7e0852655071d9f6 (cherry picked from commit d7cc92dd8d7073d705869e4a937c4a7fc069109e)
feishu: story-6987549767 Change-Id: Ic7ffd6696dc85df4a833efcad07222d0b64d3705 (cherry picked from commit 846df28cffdfc6d414beb450a6812b33918169ec)
feishu: story-7010888311 Change-Id: I4393e7c8bed02c2b5346e301f23084151f844c09
…hing(H2D). jira:none (cherry picked from commit d7aa077daed10af87543a24d03c2df1b6c787b38) Change-Id: Ic6cecfb9b49fa9e9e13a12455a847c834e1b07e5
…PA tower spawned. feishu: issue-7032995244 Change-Id: Ib907fb24559895d03873aea9cd779e87738441ad
由于哈希输入只有耗材名（品牌 类型 系列，不含 user_id），且截断到7位hex，存在跨用户：两人创建同名耗材，得到同一个filament_id 改进为hash考虑user_id feishu: story-7033779818 Change-Id: Ifeca0bbf5374ae14ef659cc49baa9d5137e2ada3
feishu: issue-7040695031 Change-Id: I4e5649fe991c67a90ddd30fc35a73117cfc18ae7
MakerLab triggers STL save via blob: object URLs. WebView2 treats this as a file download, but WKWebView navigates to blob: and fails with Frame load interrupted. Intercept blob navigations on macOS, read the blob in-page, and reuse the existing postMessage save bridge. Also reply via window.postMessage and avoid full JSON parse when checking allowlisted commands. JIRA: #7019834298 reason: other (macOS MakerLab STL blob download; no ticket provided) 自测结果: pass Change-Id: I31378810ec6abfa41ab8bd62780d8332eb3c093e (cherry picked from commit fc371891f28938d48a473b0a26c2d7ec3bf485fe)
nvtE3DHighFlow 被固定为 5（中间空出 4）后，侧边栏 Flow 下拉仍用 enum_labels 下标（E3D 下标为 4）作为 ClientData 写入 nozzle_volume_type， 产生无效值 4，进而在变体查找时命中 assert 崩溃。 feishu: issue-7047895000 自测结果: pass Change-Id: Ia2b2b8c401553d635918ec9c444d27fb9b3730b5
editor: 欧润橘 Change-Id: I2ba8d14b96f26e8ad8d41b0b6f936b169d65edf6 (cherry picked from commit 3c8e2ad7499d91a649e2a7618b406dc3ce1f3185)
… 2026-07-13 20:06:00 Change-Id: I4c62e444bc52df7df9acf10f82da53b2657daff3
Change-Id: Ieced7e09df61543e7089a07f83907f14081f144b
Change-Id: Iaf26b6a768b43bc5ad95c9c6aede5cfd0255c511 (cherry picked from commit bafc9cc74f16af5d6bf879c678378303baaae2e2)
- blend_color_multi() 优先从 standard_color_recipes.json 查询实测/插值色值， 查不到时 fallback 到数学混色 - ColorDecomposeDialog 标准模式移除 PETG Basic，CMYW/RYBW 仅限 PLA Basic - ColorDecomposeDialog 构造末尾恢复暗色模式重映射后的目标色块颜色 - TextureImportDialog 一键混色后重置按钮失效：reset_auto_mix() 清理混色引用， do_auto_match() 增加 texture_entry_is_physical 过滤 JIRA: none reason: other 自测结果: pass Change-Id: I00edbd9e55e235859b4dbd92845f536ec82f7584
feishu:story-7044006028 Change-Id: Ie243f466d82e8373400a02dfac3eff9aefcbccfb
Change-Id: I737da764bfcb090d22a6692e48a4ec72644122e3
在省料模式和便捷模式下，如果使用E3D喷嘴不支持的耗材进行切片，添加拦截 feishu: issue-7040473125 自测结果: pass Change-Id: I8ae9b1a240e3516caf0f9783d267ef4c70be0608
JIRA: none reason: other 自测结果: pass Change-Id: I609be2e150858facd02cf92725cb0b383d85550b
Change-Id: I618b363691380d2664a42e0536f60b79d07967cc
Change-Id: I293dcef4d749134b367ba113677c8c20c03a399d
编辑任一组分时，其余组分按原有相对比例缩放剩余额度。 JIRA: none reason: other 自测结果: pass Change-Id: Ie0db3fc41be68e1c670137700eafd6adcf590369
…01.00.08 branch of bamboo_slicer Git logs: H2D: github df30cb8 ENH: Auto sync 3D gcode qa_test -> github X2D: github 9c957a7 ENH: Auto sync 3D gcode qa_test -> github Change-Id: Icdf8af62d24371ce82f19beb4af70747721104a3
Change-Id: I3d338d5d918ccfe061c99f83282e0c5a3dc3e19f
jira: STUDIO-18478 Change-Id: Ie0b92d0fc985aa21a63932cc74d2a672486b0dc3
Change-Id: I2ea46f7b8811c5c43be864fd0a2e5e6502e44b68
Change-Id: Ic07aef43cc21302d9b227c53fdafba7d252aae8e
… 2026-07-14 16:31:42 Change-Id: I0769180bea968cc2c621e067587ab3f2f29968be
JIRA: none reason: other 自测结果: pass Change-Id: Ia9441210e901f813398001d2cf755c2f6946dea4
JIRA: none reason: other incorrect Chinese msgstr in English locale 自测结果: pass Change-Id: Ib7e4d83cbb897597a86191eecf5f2df4b3f66b00
Change-Id: I54042e4b4a08d18fc05b5ebc2fb35d28282139af
Change-Id: I3d34e01743122c128e9a3b0ad7e59c08bb91dd67
Change-Id: Icc80e0d0bf80615200109a51ce33cf85c24de3d7
Change-Id: Ia4a5e4d065c8fc0381f89a10771664e67e2bc7ca
Change-Id: I51eecb8b8faaf8e4b88ff92fd5d4635022cff954
Change-Id: Idc377d45b4c3a587b9d49097d6103f7571c0f53e
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
sync codes to 2.8.1.55