xin.zhang
2be0569e3d
ENH: update filament color file; the color name may be empty; using set instead of unordered_set
...
jira: [STUDIO-12346]
Change-Id: If83835fea7108babd2b19c26394ad0429493f394
(cherry picked from commit 85b07c170cd0e30f75dfab8ef68b02b0468c9f92)
2025-09-28 14:57:36 +08:00
jun.zhang
bf3875e4c9
FIX: menu item for gcode to obj
...
jira: STUDIO-12517
Change-Id: Icb4b0666f5935110f29c0b224329efbd80ade98e
(cherry picked from commit 9b126c6eade3cb0f3e0053e813152fb86841d946)
2025-09-28 14:57:09 +08:00
jun.zhang
9e990fc5c1
NEW: export toolpath to obj
...
jira: STUDIO-12105
Change-Id: I4cd110a5b63996b5dc81cb307ac6d257a817bc51
(cherry picked from commit 67f018c0eebbd467ac76e35576a5c8c9412bb67f)
(cherry picked from commit 09c9493fc44cf1da417ab2fd836d97d1501a2550)
2025-09-28 14:56:55 +08:00
zhimin.zeng
885e905e76
FIX: fix some calib dialog bug
...
jira: STUDIO-12984 & STUDIO-12979 & STUDIO-12978
Change-Id: I29fadd20b29c76a288755122dd027820fed9252e
(cherry picked from commit 1739177f3cd10b81fd1924059f6da9ba4778ba5a)
2025-09-28 14:22:46 +08:00
fei2.fang
27943f7047
FIX: Correct virtual tray loading and multi-color material display
...
- Fixed incorrect is_array() check on vtray["cols"], causing virtual tray init failure.
- Rewrote AMS grouping logic using iterators and set<int> for cleaner and safer traversal.
jira: STUDIO-12955
Change-Id: I09a68e259b56864260abb6c59ff9b1bf7ec2823c
(cherry picked from commit 60c47473047a3fba20d59cd974179537c116524d)
2025-09-28 14:19:10 +08:00
fei2.fang
470ed6af5d
FIX: Support dark mode in filament picker
...
- Applied dark theme styling to filament picker dialog
- Fixed color picker background not updating on theme switch
jira: STUDIO-12935
Change-Id: I9c7dcc518e7b0bd2c330f477ee42f4c61ea9fd4b
(cherry picked from commit 66ae7a02b945ff603b2dc699c93e55589481379e)
2025-09-28 14:19:02 +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
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
zhou.xu
94732b6bad
ENH: 3mf: fix save fullpath issue
...
jira: STUDIO-12970
Change-Id: I71bbd9fd3e1bae669fcc29822f75a3ab9025af56
(cherry picked from commit da0f893433049899227a71e5ddc79833431ce39a)
2025-09-28 13:12:11 +08:00
xin.zhang
1635ce28d6
FIX: the sort function of FilamentColor
...
jira: [STUDIO-12965]
Change-Id: Iadd8342f3b67877e8b41c28d87f5150528f340a9
(cherry picked from commit b56ca2f5f619bbafd5473416ab9bf599d2a05e7e)
2025-09-28 13:08:09 +08:00
milk
7a59122f7a
ENH:refine printer function option
...
jira:[STUDIO-12357]
Change-Id: Ie48fb2302279795f41f8b65856bd64b64d2b14f3
(cherry picked from commit 1af87a5309a311e1c2d2c96d757ed7723bd373fb)
2025-09-28 11:39:53 +08:00
milk
3a3f6d3a43
FIX:Disable when the AMS slot is empty
...
jira:[STUDIO-12764]
Change-Id: I9baea63965159f9416d91e6dea40962ec292b9e2
(cherry picked from commit 5aff60e9840343e5465833259cca2d8658a8fce7)
2025-09-28 11:39:24 +08:00
xin.zhang
4f8f642655
ENH: suite to DPI change for score panel
...
jira: [STUDIO-12923]
Change-Id: I22bb0d8ebd13d23f46bd785d3a4848669185175d
(cherry picked from commit 187040d70c9416f5f3ca9dbe74f1d1d09cb23218)
2025-09-28 11:38:17 +08:00
zhimin.zeng
7667e188d7
FIX: flowrate cali adapt to new protocol
...
jira: STUDIO-12834
Change-Id: I892219350d6dd46bc92037c146af1911214d598d
(cherry picked from commit b86677be4e5771da4362ea41dfeb3a161fcc33f7)
2025-09-28 11:36:07 +08:00
xin.zhang
c415eea556
FIX: use data to check the fan control
...
jira: [STUDIO-12917]
Change-Id: I74f816a21beb2dfb4191bb73298882efd22a6191
(cherry picked from commit 4f0f4fc64802d777d11105d433e59f57168bfd66)
2025-09-28 11:35:57 +08:00
xin.zhang
1e9febbe4d
ENH: add some support for fan control
...
jira: [STUDIO-12076] [STUDIO-12373]
Change-Id: I04e23acc802987dc7a657274074abb961f692896
(cherry picked from commit 359d52c9139b7a1aae59b990dc03f45ce4a1bc89)
(cherry picked from commit 9e16d9a4a6ce059dc134ffd388b753490dff0946)
(cherry picked from commit 4cdd1937fea90c3dd1cf0c73a7cd5172346abb40)
2025-09-28 11:35:50 +08:00
xin.zhang
95027d72db
FIX: DPI scale for TempInput
...
jira: [STUDIO-12907]
Change-Id: I7d9751856cb69babb7093973136bdfd9fad4f501
(cherry picked from commit 03adbd4becf1106d02ac4c8251bc3dbfe84c517d)
2025-09-28 11:35:44 +08:00
Noisyfox
03e056e278
Merge remote-tracking branch 'upstream/main' into dev/h2d-2
...
# Conflicts:
# src/slic3r/GUI/GUI_App.cpp
2025-09-28 11:09:24 +08:00
SoftFever
f020480900
Revamp OrcaSlicer updater ( #10884 )
...
* Revamp OrcaSlicer updater
2025-09-28 10:33:33 +08:00
Noisyfox
48149ed3c0
Fix spacing between slice and print buttons
2025-09-25 23:46:47 +08:00
Noisyfox
435faed968
Hide nozzle flow selection
2025-09-25 21:33:03 +08:00
Noisyfox
3c981f4113
Fix printer info sync
2025-09-25 21:14:51 +08:00
fei2.fang
008a98ccda
FIX: Align printer preset controls in sidebar
...
jira: STUDIO-12397
Change-Id: I728d84b8862de0a72ef467388cbf4c63b24fdcc8
(cherry picked from commit 7ceff77207916b059aa1add0f9869d0e55a59023)
2025-09-25 20:48:14 +08:00
zhimin.zeng
a776c9ae56
FIX: the manual cali image changed incorrectly for multi_extruder printer
...
jira: STUDIO-12912
Change-Id: I5315d62689d40dddfa1b804220efcd1fa7c872b4
(cherry picked from commit 91a2c4b68a69cc4d927fe24ffdffbe261b33ea68)
2025-09-25 20:44:24 +08:00
noisyfox
69d5b4ae48
Fix build error when PCH is not used
2025-09-25 20:33:50 +08:00
xin.zhang
cc358aa945
ENH: update the log trivial for parse_json
...
jira: [none]
Change-Id: I66fd48435ddd6164f848f324ffb210d24e42857c
(cherry picked from commit aa1cad57f95602a53c57043be2bf3a11b627223f)
2025-09-25 17:36:50 +08:00
xin.zhang
dcf3505bb4
FIX: the printer name not display
...
jira: [STUDIO-12821]
Change-Id: I8e99f3c09446fcdc542b61479bbcbd38fb77aaf2
(cherry picked from commit bd1d5dcce03b4de1229926f54816a6bcf953a2f2)
2025-09-25 17:36:37 +08:00
xin.zhang
88eae5d217
ENH: supporting encoded filament color
...
jira: [STUDIO-12346]
Change-Id: I7f5ce7806acb6fdeb3e3d9db52a0b96e5fadd759
(cherry picked from commit a7bdc2707d3825327258965c90c33836a7da628b)
2025-09-25 17:36:29 +08:00
xin.zhang
59ff362296
FIX: update the scale of ColorPicker
...
jira: [STUDIO-12704]
Change-Id: Iac12a24fcb880b0c5db6f62b1b0e38a9c5d60e9d
(cherry picked from commit c8bb7fb3acfc65312cacb4b38f0a7ba62810046a)
2025-09-25 17:22:24 +08:00
xin.zhang
3c4e28eb6c
ENH: Filter the AIR_DUCT_EXHAUST mode in Studio
...
jira: [STUDIO-12796]
Change-Id: I1ba64436a3b8ad4a244e9a7674c65af0b5043e50
(cherry picked from commit 79165fbad8f8654153f7dcc362ab386b00a335dc)
2025-09-25 17:22:18 +08:00
xin.zhang
8f943486a1
ENH: add wiki for replacing nozzle
...
jira: [STUDIO-12864]
Change-Id: I3804d3599eb8746902f23b59626fe8c04e949dca
(cherry picked from commit b9428cd32ff8c1c748377cab1e5539fed911177d)
2025-09-25 17:21:47 +08:00
xin.zhang
8dc43f1b67
ENH: optimize the display of drying left time
...
jira: [STUDIO-12863]
Change-Id: Id326bf25b5631c97e15e2fa8f7f74d41b84ca6ee
(cherry picked from commit e256324fb9eb299dae48e32193ce97b0b2b97f76)
2025-09-25 17:18:29 +08:00
xin.zhang
2d23db7890
ENH: support mqtt control
...
jira: [STUDIO-12442]
Change-Id: I51e43692c692c910e94d4e67349a70377b057d1c
(cherry picked from commit 5c4c3c7f953a980aebfaed5120a65e81ba79b56f)
2025-09-25 17:18:25 +08:00
hemai
527def0887
FIX: limit long model_name from makerworld
...
Jira: STUDIO-12553
Change-Id: I4d43d2b3abbb392baad2ae72d4197a6e61ab3f51
(cherry picked from commit fd0f7688508c0ff2a420bff34beae280cc24cf2b)
2025-09-25 17:18:06 +08:00
hemai
39360790c7
ENH: add new error message for AMS change filament
...
jira: STUDIO-12391
Change-Id: I358f8b09f0ce5d7d0efe91eb6dea1d89509033da
(cherry picked from commit 811823be0f5ef0e919f1084eac84c491e27971ac)
2025-09-25 17:17:34 +08:00
xin.zhang
a339677d08
NEW: add some filament check supports for printers
...
JIRA: [STUDIO-12604]
Change-Id: Ic0e7b517319621907c3c6b8ad82dbcf881c780e8
(cherry picked from commit 55a8c98e9125cdacc801ecebfd82acdcc3e8e7f7)
2025-09-25 16:38:56 +08:00
xin.zhang
6f7704470f
FIX: do not change others if mode not changed
...
JIRA: [STUDIO-12375]
Change-Id: I2ba64346706f22a6f143242c9236605de033754b
(cherry picked from commit 7b031c1536440dad942d536c831e316c5c57e677)
2025-09-25 16:25:59 +08:00
xin.zhang
0fd471fdcc
FIX: the image size
...
jira: [STUDIO-12374]
Change-Id: Ib02d0bb53911c92e2d7ca2cc16c835275e3a6460
(cherry picked from commit a1906daf4b480c8990d7af79e0de55c34cd47e47)
2025-09-25 16:25:54 +08:00
xin.zhang
14dd1cf968
FIX: studio can not control lamp if not FDM mode
...
jira: [STUDIO-12573]
Change-Id: Ibc51cf6e1024fb25026ad61e7a71398451603cef
(cherry picked from commit d9bdf975663712b80c2d96b50ffb94632fd380cc)
2025-09-25 16:25:48 +08:00
tao wang
38e6589bcb
FIX:fixed button not refreshing (page faults)
...
Change-Id: Id546112398dd2037fe839133bdd3669ed8281226
(cherry picked from commit 542aa02acde720ff73924448b27946ba69b49c73)
2025-09-25 16:24:40 +08:00
tao wang
7a197a3d8d
ENH:Reduce the number of page faults in AMS
...
Change-Id: I4bfb048ec62c35b515eecbb70c175fa0975d7f92
(cherry picked from commit 791be195475bd834c937fb63341713529e4f41b8)
2025-09-25 16:23:18 +08:00
xin.zhang
a036994e0a
FIX: set the correct color for ext even if not match, since we can select it.
...
jira: [STUDIO-12706]
Change-Id: Iccf01a6d42872af9d8c48a82731dec99981ad5c2
(cherry picked from commit 08d4a458e7a0bd19f92aecb900a84dbdefb037b0)
2025-09-25 16:10:20 +08:00
xin.zhang
7044bf0022
FIX: check the null pointer
...
jira: [STUDIO-12264]
Change-Id: Icd0a64168576f45f91ac0d9090c838a17b86b1ae
(cherry picked from commit 3950ec7454ab236d88cb27681e065c510d71998d)
2025-09-25 15:57:36 +08:00
zhou.xu
2ba649d7ef
FIX:add bottom texture
...
jira: STUDIO-11342
Change-Id: I69fd573b4d7b05135d5f280cf42d367421664cff
(cherry picked from commit 645f93fac732b8794aa1e99301bfe179a74915a7)
(cherry picked from commit 803a1dffde0f66c3076ae4fc80d4b821f34b03fc)
2025-09-25 14:42:57 +08:00
zhou.xu
bb3f59e18f
FIX:ImGuiInputTextFlags_Multiline should manual input
...
jira: STUDIO-12598
Change-Id: I7ad169d69bdbf04bb93329d7d23a5f4851123c76
(cherry picked from commit 86641262ac3d0a8a690126bdff64860bddc28114)
2025-09-25 09:42:36 +08:00
zhimin.zeng
8309c3f04f
FIX: the radio box cannot hide when manual cali mode
...
jira: STUDIO-12160
Change-Id: Iae69bd504f20adca2314f6f8b0b04cc1c55e69f8
(cherry picked from commit ef8087ad76016994a5fffdc20f4415a091452597)
2025-09-25 09:19:07 +08:00
zhimin.zeng
554ce5004c
FIX: fix the error display of default k value
...
jira: STUDIO-12546
Change-Id: Ibb674de256c306123c1ab7761945eda18704fe0e
(cherry picked from commit d3174f35d81654a36a85194b94c2cec1ee263ded)
2025-09-25 09:19:02 +08:00
Bastien Nocera
98e470f378
FIX: Fix missing std::set declaration
...
/run/build/BambuStudio/src/slic3r/GUI/PrePrintChecker.cpp: In member function ‘void Slic3r::GUI::PrinterMsgPanel::SetLabelList(const std::vector<wxString>&, const wxColour&)’:
/run/build/BambuStudio/src/slic3r/GUI/PrePrintChecker.cpp:182:10: error: ‘set’ is not a member of ‘std’
182 | std::set<wxString> unique_texts;
| ^~~
/run/build/BambuStudio/src/slic3r/GUI/PrePrintChecker.cpp:4:1: note: ‘std::set’ is defined in header ‘<set>’; this is probably fixable by adding ‘#include <set>’
3 | #include "I18N.hpp"
+++ |+#include <set>
4 |
(cherry picked from commit 4c9be9a0e42d5e7b94086bcc696c75aa8319c63d)
2025-09-25 09:16:49 +08:00
xun.zhang
2ae055cfb3
FIX: do not show multi extruder params in single extruder
...
jira: STUDIO-12679
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I3bba9ac0bddf0f03eb79b2eaf71e1dee8e2741a7
(cherry picked from commit b4f2ff2bdc47d9295135a668787dcd0349e9694d)
2025-09-25 09:14:52 +08:00
xun.zhang
3a5d473aae
ENH: hide filament flush related params temperarily
...
jira: none
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I9daec5cc4a25b5bad15d57f71d800a6b6ebbb9b4
(cherry picked from commit 2758a093cf8ece4de01d777f5ff35c259577aa51)
2025-09-25 09:04:32 +08:00