Commit graph

332 commits

Author SHA1 Message Date
Noisyfox
93c4838efe
Merge branch 'main' into dev/p2s-pr 2025-10-31 16:54:45 +08:00
Noisyfox
05533a7fd3
Fix black bed texture if svg file (#11166)
Some checks failed
Build all / Build Linux (push) Has been cancelled
Build all / Build Non-Linux (push) Has been cancelled
Build all / Flatpak (push) Has been cancelled
Build all / Unit Tests (push) Has been cancelled
* Fix blank bed texture if svg file

* Refresh scene once the texture compression is completed
2025-10-31 16:53:08 +08:00
weizhen.xie
edced8d5a6 Fix: When the flushing multiplier is 0, a warning popup should also be displayed.
Jira: STUDIO-14962

Change-Id: Iee6887fb6ed6941bbd58d9d2b834b6654ee9c806
(cherry picked from commit 43dbb7f228afb4304b6ea398991efd2659feafbe)
2025-10-28 15:30:01 +08:00
weizhen.xie
2959f7549c FIX:Flushing volume button interaction optimization
Jira:STUDIO-14583

Change-Id: Ic1a600e92fb408b690febbd3f7a78924aed42e7a
(cherry picked from commit 672b3b54119b46c8e19f635520d4f78710128815)
2025-10-28 15:29:53 +08:00
weizhen.xie
06acdf2609 ENH:Give a warning when the flushing value changes or is zero.
Jira: STUDIO-13175
Change-Id: Ibc5a912464322d2bc40514c310dfc4859bbd79b3
(cherry picked from commit 3fa4b149a0a529d8a2b1c6b6b80415161c13b2c3)
(cherry picked from commit f6c03caaa744b774ffc9d6150b3691d232ced472)
2025-10-28 15:29:47 +08:00
Vovodroid
e922411371
Add instances (#6237)
* Add instances

* - Added a new menu item for converting instances to objects,

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-10-26 16:13:14 +08:00
Noisyfox
da2934d02a Revert "ENH:instead of prime_volume by filament_prime_volume"
This reverts commit e7e6405ad3.
2025-10-05 19:16:05 +08:00
xun.zhang
f7643eb3be ENH: update prompt for filament mix printing
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I92c86edadd6720b0e566057bd2593605ee4a3f77
(cherry picked from commit a93f6a54a2be94807702e3c75bdb4c79d508f260)
2025-10-03 23:08:53 +08:00
zhimin.zeng
89c58fb4d9 FIX: add clumping detect area parameter
1. add wrapping detect area parameter
2. fix spiral retract bug
3. modify the enable parameter to print config
4. close clumping detect for manual cali mode
jira: STUDIO-13761 & STUDIO-13766

Change-Id: Ib597ca48a0342a8ae3930f5e790085987f252374
(cherry picked from commit 698a5e6bc0b281ba77fc1fd7692daec09cb440b4)
2025-10-02 17:07:17 +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
5a1dc90e8c ENH: add prompt for incompatible filaments and nozzles
jira: STUDIO-12873

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ieb79a35e0609e7687fdcf31742df3a08fedc925b
(cherry picked from commit 1ef32833035629c1b3644d77fdc9c234992090f3)
2025-09-28 14:03:52 +08:00
zhimin.zeng
d58a93b501 FIX: After the slicing with prime tower error, cannot slice when switching printer
jira: STUDIO-12416
Change-Id: Ie63cd9dd6bb6762ba5b709d383d9794a6b9a79ee
(cherry picked from commit 658ab94798394edb956a700c1b4f2f1999e4f1ff)
2025-09-24 11:41:27 +08:00
zhimin.zeng
aca0f883f7 FIX: the wipe tower out of bounds prompt is incorrect when there are multiple plates,
jira: STUDIO-11817
Change-Id: Ie0b9ac36d568f6d4d6cd134056e4d850612c1961
(cherry picked from commit 5f624b72484a3ddf15318e4e0fcbdc41b98b3a85)
2025-09-24 11:02:54 +08:00
zhimin.zeng
3fd9b7ef8a FIX: modify the behavior of wipe tower
The prime tower is not allowed to extend beyond the plate boundary when moving it.
jira: STUDIO-11817 & STUDIO-12313

Change-Id: Icbb85dad26531b0ac01f088fc086b4ff499ac423
(cherry picked from commit 8f4d5f44d721fa9cae70cd9b47735c93151f2b81)
2025-09-24 11:00:37 +08:00
zhimin.zeng
f8a689d516 FIX: add warning when wipe tower outside
jira: STUDIO-11817
Change-Id: I4352f8485e98c84a0ba75d0b2cc8a339e02c209e
(cherry picked from commit ce4bf4bc1bd2342c4bd3a270ed3b7619c7529c7f)
2025-09-24 09:38:42 +08:00
jiangkai.zhao
34e653d0a3 FIX:wipe_tower not visible when timelapse_enabled
jira: STUDIO-11991
Change-Id: Iee7728110e449890f530f0ef2cdd2e982dceb347
(cherry picked from commit 18a09d36145b2885feaa4f3a14a1be84ab5d964d)
2025-09-23 09:03:26 +08:00
jiangkai.zhao
bf71932371 FIX: error wipe tower display
jira: STUDIO-11556
Change-Id: Ieda172923aa01bc0518a3370e69daa5fab8d8f6a
(cherry picked from commit 68d7ef49a9a4e286b37fc01c47ed80238d9f94dd)
2025-09-21 13:47:59 +08:00
jiangkai.zhao
64126754a5 Fix:Multi-head single-material prime tower error display
jira: STUDIO-11527
Change-Id: I43eb4fdd5364af4716868551e56461b15c3158c3
(cherry picked from commit c6246be5631d19b577df28d5ee25a29b3368b37f)
2025-09-21 13:47:58 +08:00
zhou.xu
72fce85874 FIX:empty plate slice state should set to UNSLICED
jira: github 6276
Change-Id: I1a25cb2920806fc09f6d666bf043433837190ac2
(cherry picked from commit 61204671b0b462f49363d11e2bff79958bba031c)
2025-09-21 13:47:50 +08:00
Noisyfox
178c6092b4 Merge remote-tracking branch 'upstream/main' into dev/h2d 2025-09-18 17:24:07 +08:00
zhou.xu
a95a44844e ENH:modify text
jira: none
Change-Id: I7bb2bc5fa0a1a14afce822b67c3dd095c4bf6549
(cherry picked from commit f3f6032de9657c681806bbaee0ce5881938be368)
2025-09-18 17:16:07 +08:00
xun.zhang
cd16bd83a3 FIX: translation problem
1. add regroup link

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia90c80f5ff86e785e00fb0c38360eb33424a5ddd
(cherry picked from commit 01be3a51e646a9ca4277c490396417c95d983648)
2025-09-18 16:38:26 +08:00
zhimin.zeng
7f6d45ecfd ENH: add wiki link for mixuse of pla and petg
and add wiki link for tpu and brittle materials
jira: none

Change-Id: I15202158cc2ff9b710e80e181bcdf9659e93ff75
(cherry picked from commit a967c41edcc2489e2b348637e4cdfcefa22b2914)
2025-09-18 16:38:02 +08:00
xun.zhang
f4445d0c04 ENH: optimize group logic for unprintable filaments
1.Also fix a tip mistake

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia52f95988d467a7018579a774376578b83e7ca05
(cherry picked from commit 804fe8d124e916f5957244913a50d24aceb621bd)
2025-09-18 16:13:25 +08:00
jiangkai.zhao
9dacc33e72 Fix: crash by wipe_tower_data's null pointer
jira: none
Change-Id: Ic33c40f7dc27b6ca18a44a790c4e4e01d0305792
(cherry picked from commit 04d64d5e006ec11fecea73f324d1c129d5e02a42)
2025-09-18 10:08:40 +08:00
jiangkai.zhao
1828e3b98f ENH: adjust estimate_wipe_tower_size
jira: STUDIO-10540
Change-Id: I552acf16a1f02f2d6feb783327a0a9a83ac4673a
(cherry picked from commit 1522fe5ff2ffa176dc045d343ef2985c0e7533f8)
2025-09-18 10:07:50 +08:00
jiangkai.zhao
5573293582 ENH: Use the real prime tower model after slicing.
1. set wipe tower real height
2. fix wipe tower small arc error
3. add rib_width constraint to ensure that the rib wall of the wipetower are attached to the infill.
jira: STUDIO-10540

Change-Id: Idfdc809f0236121d98587ac2a09a2ebbf5caf945
(cherry picked from commit 3a7dcfd23249571224a4d538c55907a0a5c6154d)
2025-09-18 09:33:02 +08:00
lane.wei
6f2f8c584e ENH: wipe_tower: use uniform wipe tower logic for cli and gui
jira: no-jira
Change-Id: I179212585871071cd17bd37c2756444a2d7aba1f
(cherry picked from commit 1f3dde94980d3685bb4d1266e8a5448b8f231b9f)
2025-09-17 23:29:14 +08:00
lane.wei
c8484d99d6 FIX: gui: fix some .gcode.3mf can not load issue
jira: no-jira
Change-Id: I8a80936f7a3e1a70116e474cd4429fb23b1d218b
(cherry picked from commit 9ad06ba3f49c32d0bf6cb40cc838f3be12ee7d35)
2025-09-17 23:17:21 +08:00
jun.zhang
256eca69ab FIX: position of LayersEditing dialog
jira: STUDIO-10706

Change-Id: Ibadeef751ad500f61b9ab20cb7f030c461869399
(cherry picked from commit 38da475197b5059225f732d11963f10f1d58ad6b)
2025-09-17 22:32:36 +08:00
zhou.xu
06e6fc8568 FIX:set "picking" true in pick render
jira: none
Change-Id: I110f8fe4811280fbc59282752e06330f7f9dc665
(cherry picked from commit b9c3cb89ec0a880c125679fe6edce7a95ddc10e0)
2025-09-17 17:58:34 +08:00
zhimin.zeng
30bbb93680 FIX: the nums of filament_type in plater config is incorrect
2. Improve the judgment and display of the extruder printing area
jira: none

Change-Id: Ie9e1991904bfbc5bffceedb7810b1d1fa598933b
(cherry picked from commit ca5ec101f9a679d8ea4360d96a2db606923b8429)
2025-09-17 15:49:03 +08:00
zhimin.zeng
34b5b96400 FIX: fix the error slice status
when filament printable check is not valid
jira: none

Change-Id: I6d98e3aa27b063d2e7431f7aa5637348978331f2
(cherry picked from commit b0a8dd1014d3184be8ef9f2a4e9bd304cf4bdea3)
2025-09-17 10:21:15 +08:00
Kiss Lorand
c3521b4d25
Reflect swapped mouse buttons in Help → Keyboard Shortcuts (#10647)
Some checks failed
Build all / Build All (push) Has been cancelled
Build all / Flatpak (push) Has been cancelled
Swap function description
2025-09-16 23:18:59 +08:00
xun.zhang
6b16ac1fcd ENH: update translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I85317044598c4a014c095cca30d1e9abc1fa9145
(cherry picked from commit d64977c9abe5b1cdc81876dc9124e9b1dbeba899)
2025-09-16 15:42:15 +08:00
qing.zhang
1b90abe640 ENH: translate
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2ed88be363eb5f1bd8a35269d669f3947d46e7f4
(cherry picked from commit 0e21d762be12a352be7c3e0411a71dcebcbf270c)
2025-09-16 15:39:14 +08:00
zhimin.zeng
481405f68c FIX: modify the printable range error prompt
jira: STUDIO-10116
Change-Id: I489ff742f51ab8883306883ee59c98a31523fd34
(cherry picked from commit 9eee96ead7ded02c5ef1fa321b98d7a893074ef4)
2025-09-16 14:49:20 +08:00
xun.zhang
0b01388f49 ENH: jump to filament map dialog in error tip
1. Remove error tip for unprintable areas if no longer needed
2. Add link for filament map dialog in error tip

jira:STUDIO-10073

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic3235038de73a85964c6dbcb9b4f435e7aa47d34
(cherry picked from commit 1793060e96cec973d9606bd4fbe36686671e0fee)
2025-09-16 14:48:16 +08:00
liz.li
307bb051e6 ENH: refresh FilamentUnPrintableOnFirstLayer error state
jira: none

Change-Id: Ifec994cdba2c9590d4c1f8b59e6052593fd05bc2
(cherry picked from commit 04eeb40e1eba976e0921686bf6d66599a90e81cc)
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
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
Noisyfox
b55a0226b5 Fix compile error 2025-09-12 16:56:45 +08:00
zhimin.zeng
a5ae552512 EMH: enhance for rib wall wiper tower
1. fix the slice error status
2. add rendering for wiper tower
3. modify the wipe tower start pos for rib wall wipe tower
jira: none

Change-Id: If554ca0fb30f6c7ce9641014c0ed4a7f23afd6f4
(cherry picked from commit 3ae08b458dea1d04cad33b2787d98407111b038c)
(cherry picked from commit 55772c59126bc4dd5c2ad022e7a959785c29cb4e)
2025-09-12 15:37:46 +08:00
xun.zhang
6d622a7f5f ENH: modify sentences for translate
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic97b6d9dce8de77308f0893b55d621d5c250531e
(cherry picked from commit e82fd6b4752e0f72c33afb6d65d9c02b666585e4)
2025-09-10 16:22:30 +08:00
lane.wei
48c67f6d94 ENH: GUI: remove object limited warning
jira: no-jira
Change-Id: I89bc082721bdc05ed2f41febc12a4f4252308ac0
(cherry picked from commit ff02619730f6af3910b535c419fc798b4a9a9d62)
2025-09-10 16:19:14 +08:00
lane.wei
d6715225c7 FIX: GUI: refine the error message when switch plate
also refine the text
jira: STUDIO-9809

Change-Id: Ifce527d3d19ead80b314611de8f3f861dc598188
(cherry picked from commit 014996d4258cef42ce943157d6485fad9cc98ee2)
2025-09-10 16:19:03 +08:00
xun.zhang
4742521930 FIX: always empty popup in unprintable case
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I90fcb90ef01e8cc398683bf00eb8d87eefe95069
(cherry picked from commit f79ba9e315689202f592cac3dcc3027c4eae9164)
2025-09-10 15:28:25 +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
xun.zhang
ae75d8b8a5 ENH: update some sentences and refine ui
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibba2d6c880fcb810f861cf06eb7a30a512cbbacf
(cherry picked from commit 5195e824814a1ee38d789f331ec86e73807d412a)
2025-09-10 15:00:25 +08:00