Commit graph

577 commits

Author SHA1 Message Date
zhimin.zeng
b3689ec700 FIX: modify the text of Clumping detection
jira: STUDIO-13659
Change-Id: Ib033689f89d90f14f1eab0a488fa76cbb705afb8
(cherry picked from commit d1606d12b53fa21aab38d882b8bac3215af03e71)
2025-10-01 21:21:42 +08:00
zhimin.zeng
1ccdf7b43b ENH: add wrapping detection
jira: STUDIO-13192
Change-Id: I0fb5692b18cdb3b7af624a831dcfb0f635b165f0
(cherry picked from commit 89a8b6ea5e34340cba3750416ce3100dcc39f5c2)
(cherry picked from commit 50bc8c10a7b4ddc0b2dfe9cbab438b9d307b7fc0)
2025-09-30 15:32:44 +08:00
xun.zhang
bc02e48dc0 FIX: display the minimum flush data
1. Use the minimum flush between nozzle volume and flush in datalist
2. Add a new param to decide the datalist to use

github:7445

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id87c98ca5069e7b328974d641d7a81dfbf9c50a0
(cherry picked from commit 2be29b784727330732170b5c2ff0ba9d5e79d82f)
2025-09-29 20:38:38 +08:00
fei2.fang
9ee76e4775 NEW: Official filament color selection approved
- Add a filament picker dialog for official color selection
- Enable displaying multiple filament colors in the picker dialog and preview sidebar
- Introduce two new config options:
  - `filament_multi_colors`
  - `filament_color_types`
  to both the application config and the 3MF config

jira: STUDIO-12346

Change-Id: I66f8c1ec9147df4f5948c8a329c1737551280e63
(cherry picked from commit 522dc0bbca49033a1ba9725ca7f6c3ea729691a6)
2025-09-28 14:17:52 +08:00
xun.zhang
d6a8f881de FIX: add a new way to calc params size
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I75a983a8c2ec1d9e4b691e32e8beead0868d2644
(cherry picked from commit 55162b1f7d4f9e0abc3de961fda5085b66f73b2f)
(cherry picked from commit c86da564e0cd4155b155b84debd7f0f0da1b20d4)
2025-09-25 17:00:45 +08:00
Noisyfox
8653f034e9 Fix crash due to profile variant difference 2025-09-25 09:41:54 +08:00
xun.zhang
3c051f4180 FIX: invalid params in user preset load
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e9cdabb2d9c285db841c810f32aee5943b4db82
(cherry picked from commit ff8d764e7256cec1e7cd1d4d3d034590eb846f45)
(cherry picked from commit fb0461f3459afcfc80165442277ba8c54e232a39)
2025-09-24 14:37:18 +08:00
lane.wei
8c64808ae5 ENH: config: remove unused custome_defined logic
also improve project_embedded
1. remove unused is_custom_defined
2. improve project_embedded to support multi-extruder diff

jira: no-jira

Change-Id: I1db28c3cfd59ccc31c6855af30305396c71c4e9a
(cherry picked from commit 0434853bf32b063f7850fd4e0c9c3a6045375225)
2025-09-24 14:33:37 +08:00
lane.wei
ae72d3345f ENH: config: add nill load/save logic for user config
Change-Id: I8da6c5b345cc088862f2c720aeb742b9617ff3e7
(cherry picked from commit 603f93d97f0ad70e01e120854887142ab05ee089)
2025-09-24 14:17:53 +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
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
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
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
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
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
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
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
Bastien Nocera
ff9f223042 FIX: Fix missing boost::algorithm::split declaration
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp: In function ‘std::vector<std::map<int, int> > Slic3r::get_extruder_ams_count(const std::vector<std::__cxx11::basic_string<char> >&)’:
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp:454:27: error: ‘split’ is not a member of ‘boost::algorithm’
  454 |         boost::algorithm::split(ams_infos, str, boost::algorithm::is_any_of("|"));
      |                           ^~~~~

(cherry picked from commit bf32b5a489670df588ee2ac217275c6c0b8170ba)
2025-09-18 23:00:51 +08:00
zhimin.zeng
9cdabfbd59 FIX: Remove unprintable_filament_map
jira: none
Change-Id: I30285d0cc98a974e71f16fd9adb57dfcccb39415
(cherry picked from commit 1959fa7d5c213a7720b8f215f1578597278e6920)
2025-09-18 14:13:51 +08:00
lane.wei
532224fa8b ENH: config: remove unused assert
jira: no-jira
Change-Id: I3e2bea9f2fd5483c3a0f492bf6a1e47274315d28
(cherry picked from commit 5ddf3ac86fe0b08c50ac25baea7f0c4a7475d2d2)
2025-09-18 11:05:26 +08:00
lane.wei
85c5641c40 FIX: config: fix some potential crash when switch configs
switch configs between single extruder and multiple extruders
jira: no-jira

Change-Id: I3a7ebd590b061f7dec4d8d12d5508e869a941beb
(cherry picked from commit 1e4c82c781ff8a634cecc9e419377c36f0775492)
2025-09-18 11:00:05 +08:00
lane.wei
5e04588837 ENH: CLI: keep the params of old version
jira: STUDIO-10695
Change-Id: I4b0a768bc4fc6c856c9c92fa4a05007a3097df35
(cherry picked from commit a44da293ad3a1fbc62e318c20b3ba7c187fc1d25)
2025-09-17 23:09:07 +08:00
xun.zhang
b6d33931a3 FIX: wrong value in param
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3521005617f414f57247599f3211e87f576a28e5
(cherry picked from commit b2f32e501021beb5119543524aa9d6487123d758)
2025-09-17 17:37:16 +08:00
xun.zhang
8c6e7f3d40 ENH: handle legacy for ASA-Aero
1.Change ASA-Aero to ASA-AERO

jira:none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I49c4c31b9928e07b67b9893a4b204c2418089f17
(cherry picked from commit a13c47281693a57439cfef2bd312a35d6d74ac0a)
2025-09-17 17:36:23 +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
jiangkai.zhao
34d0855ba2 ENH: Modify extra_rib_length can be a negative value.
jira: STUDIO-10535
Change-Id: Icd6134a96c1f32111f908e87acda8c5132dcd73c
(cherry picked from commit cbf4b3eafff29ad961deec6acad5104e34a57481)
(cherry picked from commit 4fadeab45040daff079044965eea0e3c4e9f74c7)
2025-09-17 16:11:05 +08:00
jiangkai.zhao
13f920b12a ENH: set max prime_tower_extra_rib_length to 300
jira: STUDIO-10569
Change-Id: Iad518db29206d16bb59b5a938623d351862a190a
(cherry picked from commit e71adc067cf3284d054dc37dc588ab9161de01f7)
2025-09-17 16:10:53 +08:00
jiangkai.zhao
e85fc25690 ENH: update translation
jira: none
Change-Id: Iceeaf2d9bb93fcee4fadfdfc2a5f1f7ab4a0b684
(cherry picked from commit 2421cd430df8c2bd9c632c303388afb5b7064ee0)
2025-09-17 15:13:02 +08:00
xun.zhang
137fffa857 ENH: update translations
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0a7f24dd1538f4baf1b2b56f35233de5937a6d30
(cherry picked from commit 4747cbc53a5e5e8457f03914755d192421ea1d57)
2025-09-17 10:21:15 +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
a42a87ed1c FIX: update some translation
jira: [none]
Change-Id: I76afc7adb4f882bcd64c266cb10160333ce439d6
(cherry picked from commit 45d2d3fc9b0e97947be74874255b5be3c1c77f68)
2025-09-17 09:47:34 +08:00
xin.zhang
6a7b6f2094 FIX: add compatible codes by xun.zhang
jira: [none]
Change-Id: Ice769643fb8109b60e2f5323286c61bf9c934db1
(cherry picked from commit e88042bb96e3e851e4707092906d166785e08c34)
2025-09-16 23:01:14 +08:00
zhou.xu
ec8bcc22d3 ENH:translate text
jira: none
Change-Id: I49ceba7546b6c5e32efd8cc040b090b63f076886
(cherry picked from commit d2d620f87c3bb24c44e6e797418d4219656370eb)
2025-09-16 22:58:59 +08:00
zhimin.zeng
f8ac3a6eaf FIX: modify the name for filament ramming length
jira: none
Change-Id: I3533c86ad7901282866074a7a8e4909c360055a6
(cherry picked from commit 31b8eae04491240f1aa96f84365efa392be1fc4a)
2025-09-16 22:17:48 +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
jiangkai.zhao
9e29f2db0b ENH: add wipe_tower infll gap
and fix wipe error when enable timelapse and in single color
and set rib wall as default
jira: none

Change-Id: Ic365bb7ee0ee6715c9d4f4f00b4bca9fd472c61a
(cherry picked from commit 89b59f1c41e0f360457622438a09237bfa1eaa18)
2025-09-16 21:34:10 +08:00
zhimin.zeng
5458e0ea6c ENH: Add parameters for extruder page of printer preset
jira: none
Change-Id: I8eb37e41bdc4b2b1f2328acee324c6fad30e391c
(cherry picked from commit d0f89eb8628b4225fc2c6a7b9f2a2eb49bb4f05a)
2025-09-16 19:38:42 +08:00
jiangkai.zhao
a753dd9200 ENH:modify interface of wipe tower brim_width
jira: none
Change-Id: I22e3c30aa6320e7e66316fa15b6c06e26e458a94
(cherry picked from commit 74a4b1bd49a2d1719c96a73cc054943d1fd4d4a2)
2025-09-16 17:24:06 +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
jiangkai.zhao
8b6ffd8428 ENH: update prime_tower_brim_width‘s tooltip
jira: none
Change-Id: If085d80bd29a4ed4c95aa8dcdec76608a0f86ae7
(cherry picked from commit 851dd6708222108a7ba2313da8691a7b96212cc6)
2025-09-16 14:48:54 +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
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
qing.zhang
a6c4e22e15 ENH: move extra params
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib5c4d203c6585b9946d8703d9f33477780afb275
(cherry picked from commit 78079dacd1c4f14c171668d6c7895e72dd96c52a)
2025-09-12 17:43:07 +08:00
jiangkai.zhao
b9d9602581 ENH: adjust the interaction of the rib_wall
jira: none
Change-Id: I2462240304fc4ce4a1047d7c8ac818c209f15200
(cherry picked from commit 6567642e938a4edd4197535418aeb8be0bbc7c55)
(cherry picked from commit 1f4d2cf714e70ab27ceaaeb75df02650f527b570)
2025-09-12 15:32:47 +08:00
jiangkai.zhao
16731a90b0 ENH:add rib wall wipe tower
jira: none

Change-Id: I9699cc74e206851284949f89230e986435b9e1b7
(cherry picked from commit eabfa6b272590698886ecec33b89207605b91993)
(cherry picked from commit 1d33d1c37d4dada1cd1129ff16fe46d07933ad26)
2025-09-12 15:31:11 +08:00
SoftFever
466aa76642 fix typo and tweak precise_outer_wall message 2025-09-11 21:07:46 +08:00