30d279d5ba
ENH: support multi-color with external
...
Jira: [STUDIO-12520]
Change-Id: I34c88b6a84514a0e56e65723f91d1a2940128e8d
(cherry picked from commit b8879ec648e038080628190fc363251229bbd5ee)
2025-09-28 17:13:54 +08:00
ec23cb6d4c
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
565ac58fd5
Revamp OrcaSlicer updater ( #10884 )
...
* Revamp OrcaSlicer updater
2025-09-28 10:33:33 +08:00
357e024269
FIX: cannot send manual cali for H2D
...
jira: none
Change-Id: Iceb7db15d5d32d2db04c01527dad65022d580772
(cherry picked from commit 023b5efc4ca4c0e049a6e39cd39830dae73681eb)
2025-09-25 09:04:26 +08:00
888c6b371e
ENH: [filament] update process desp for H2D
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Iff81fdc19b6a3886f308f853b8ab92feee1c7375
(cherry picked from commit ea0f7628bb5335b956da0092a3fea25916bf82af)
2025-09-24 10:02:44 +08:00
a47f9fea4b
Fix build error when PCH is not used
2025-09-21 13:48:07 +08:00
308218a7f0
FIX: modify the default k value for display
...
jira: none
Change-Id: Ib92bf722f21994db02dac5b162215709090d786a
(cherry picked from commit 4cb3a63c78a202e7f4b66250ba94a6350c2bd8d3)
2025-09-21 13:48:03 +08:00
c0753eb2db
ENH: add nozzle type ntTungstenCarbide
...
jira: [STUDIO-11597]
Change-Id: Ibec41549042d253aeb85ba81e93e7c26a4a56ed2
(cherry picked from commit 1352cff31427eadd2c85ce4c9602ab3379a5ae9e)
2025-09-21 13:48:01 +08:00
35e6950b60
FIX: add filament id to filament_ids when send cali job
...
jira: none
Change-Id: I6e3e8c38b67fe62442fa369f072fd1743f35f38f
(cherry picked from commit ec9193ffb06e12411b4e521c12d9e16f121f54d1)
2025-09-21 13:47:50 +08:00
a91f105119
FIX: Fix missing wxDC declaration
...
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp:44:56: error: ‘wxDC’ has not been declared
44 | static void get_suitable_font_size(int max_height, wxDC &dc);
| ^~~~
(cherry picked from commit 7f24d5123766fbcfcec6f1343eefa32edb6254d6)
2025-09-18 23:02:19 +08:00
1f2be4fb9d
ENH: some tpu filaments are not support auto cali
...
jira: none
Change-Id: I253e5c5936bc5fb90612f385e358b3015bdabf2e
(cherry picked from commit f38d8f959fabd36e4971c9b58eac193eb30fcd8f)
2025-09-18 10:42:33 +08:00
257b3f1e06
FIX: remove redundant diameter check
...
jira: none
Change-Id: I1c1c5bc91edbe1e5c26c094756c3e2935485d5f7
(cherry picked from commit a2619e7b315decc1ec9873436652ebb32fdfbdef)
2025-09-17 17:58:57 +08:00
3cc0f92847
FIX: the extruder_id is incorrect when cali left nozzle
...
jira: none
Change-Id: Ice9c5ad93840223d59ac2a1c56935051382d5efb
(cherry picked from commit 53e50e285cee4b99b55f3d66f930429031c347e9)
2025-09-17 17:36:42 +08:00
6b6b5aa49e
FIX: get suitable font size to draw the texts
...
jira: [STUDIO-10067]
Change-Id: I589fd6a271ae177e4630e403b64c18090aab9471
(cherry picked from commit d036c92a3793e8c0c758432b52f2af8ffeff751f)
2025-09-17 15:00:05 +08:00
315f0e8b2f
FIX: modify the message of cali
...
jira: none
Change-Id: Ibc2dfa0588a02508cc625eedb3da38d0eae2199c
(cherry picked from commit 2004e769cedc01364f36a1542849c8030d3d1a96)
2025-09-17 11:34:49 +08:00
d6c9b6500a
FIX: StaticGroup constriant layout badge on macOS
...
Change-Id: Ia93c91b990ec3f5fef3eae57d48ca71b4a0841e6
Jira: STUDIO-10383
(cherry picked from commit 88521a06d12cd4ebbcb8e98d8c929e9815aa71de)
2025-09-17 10:21:16 +08:00
c8b8fc5a21
ENH:add "forward" function in MsgDialog
...
jira: STUDIO-9971
Change-Id: I699912b4d18cb52aec2badf64a4655d20559ed7c
(cherry picked from commit f608327a108c1eece45ee75bde0c3aa35974f166)
2025-09-16 15:41:08 +08:00
cff47d01bf
FIX: the pa pattern is not work
...
jira: STUDIO-9841
Change-Id: Ie7de3f1bc3950e8e3afbdab87eb1669edb970564
(cherry picked from commit 87bc6b834532da4c161ecee34b58620f114e348e)
2025-09-12 17:39:10 +08:00
7d76f3a6d9
FIX: the extruder_id of cali is incorrect with N3S
...
jira: STUDIO-9888
Change-Id: I25c4a436e322923a247d1c6d3c3de9f0319bb420
(cherry picked from commit 13355ca669229839e8c8943f80cc50533256d0d7)
2025-09-10 11:01:27 +08:00
6c2d388fa4
Fix: modify the max_k_value
...
jira: none
Change-Id: I5c2a9d00f63ee310cdc144521da6d37e70fd23d1
(cherry picked from commit 8c5a202f4ac05e8109e148e9ef32844f0dec6805)
(cherry picked from commit 0ab64d0ccecb038d7cc928c8ca0fe61911c93d0e)
2025-09-10 07:25:25 +08:00
427d683d5e
FIX: modify the text of calibration
...
jira: STUDIO-9499
Change-Id: Ie4ccde7e9e2d0aebdc604da74716036954445be8
(cherry picked from commit 6b90e5b877cc861f9ea66065d5e9079c0189a538)
2025-09-07 23:27:35 +08:00
4c6a7b1a33
ENH: modify some sentences for translate
...
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I6ba3de47566c73ee8d6f8f5f24c854b9599dc073
(cherry picked from commit f858d6c7a8509d3b798bca40cb07eb63ab6efcc0)
2025-09-06 23:53:37 +08:00
49f8943885
ENH: add nozzle initialization check
...
jira: none
Change-Id: I9378295113c78c1775fa396d592501758d888182
(cherry picked from commit 9c1d6b206722523d79cf07bec25d7866844e4eae)
2025-09-06 23:41:54 +08:00
3d3ed4deae
ENH: add sync button for cali preset page
...
and modify some UI part
jira: none
Change-Id: I9462a10adb7017a7038e5cd7e30cf393b63ae77b
(cherry picked from commit da68a52247c3a963b9d5df339da8f80ead617839)
2025-09-06 23:38:15 +08:00
ace219490e
ENH: add more tips dialog
...
JIRA: STUDIO-7801
Change-Id: I672082d97c5afa144f704959c0c56d70fddd3a6a
Signed-off-by: Stone Li <stone.li@bambulab.com >
(cherry picked from commit 3f94e72cae8e799e25b623e0c0924d7cf813fc5a)
2025-09-06 23:12:06 +08:00
562b07946a
ENH:change SD card to external storage
...
jira:[none ]
Change-Id: Ia8fb38151f75433344a085196728752d2fe6f159
(cherry picked from commit 6c7b61fcd8aefd9ad9da56da8b55e0c06865a677)
2025-09-05 19:48:50 +08:00
d06fce0579
ENH: add printable check before cali
...
jira: 8816
Change-Id: I7df5676ecc80c27b516f47efe00ac40d04a4a5c9
(cherry picked from commit 13a4edc97c5ba0fc5f8a0a7263608597ce923548)
2025-08-28 15:22:39 +08:00
1b060b1b24
FIX: cali: fix the 3mf wrong issue when cali for multi-extruder
...
jira: no-jira
Change-Id: I352e4dd499f4e4dd22cdc21f3f62428a0baa5bfb
(cherry picked from commit f9cd3dd8764ab551c2aa85cdb7383b19bc345f36)
2025-08-26 20:27:08 +08:00
671dfa5f0c
ENH: buildvolume: add logic to support extruder_printable_height
...
jira: no-jira
Change-Id: I962c4aed8c536c0fd8b89ae090cd0463c5d645db
(cherry picked from commit 43773d77010492453473797e77e83e9a4630c25f)
2025-08-24 23:18:30 +08:00
b35c1dd267
FIX: 1. the status of ams item is not correct
...
2. fix the status cali button of stat page is sometimes incorrect
3. when the nozzle volume type is not the same as printer, prompt user to sync
4. fix the incorrect nozzle volume type of cali preset page
jira: STUDIO-8856 STUDIO-8832
Change-Id: I83569f41533681b3d2f68d7b86be68955bd957f1
(cherry picked from commit 9dffa8d00281e06b24c29d818064e1c55418333d)
2025-08-24 23:18:29 +08:00
8fb986b6ad
FIX: modify the name of high flow
...
jira: none
Change-Id: Icd1a0ac91e957fc38a6f072b1bb3af0c97be398e
(cherry picked from commit ea0691f092755d7e68db3ecf8b46b0e86a8fadb2)
2025-08-24 23:18:28 +08:00
cbfdb98dd6
ENH: support auto pa cali for multi_extruder printer
...
jira: none
Change-Id: I835a0e20de81f9af7c40983e00bdb37ea6c95a68
(cherry picked from commit 4e387d4ace4332a7c2b6c0ab695b80a51597d0c7)
2025-08-24 23:18:27 +08:00
40a9490f01
FIX: show k value when select default pa profile
...
jira: STUDIO-8540
Change-Id: I1c92628fa888f935762d31968237e28d65594e51
(cherry picked from commit 3f791574cd5ae384ee295e595f35d45c78ac719f)
2025-08-24 23:18:25 +08:00
a9fe07b35b
FIX: fix flow ratio calib bug for single extruder printer
...
2. modify the filament_flow_ratio to nullable
jira:none
Change-Id: I3f0569ee643cfe9473c6029ca0e04f4b80c8332e
(cherry picked from commit ed61d1d31bdc79f064567deacf35e05bd123880d)
2025-08-24 23:18:13 +08:00
8069133261
ENH: dual_extruder: add logic to process extruder_printable_area
...
JIRA: STUDIO-7498
Change-Id: I1cf53db93acf41b06cb1b9569a0679487c9f1e41
(cherry picked from commit e5be69dedd1ba6dc289a14b89598c9a6101dacb3)
2025-08-24 23:18:12 +08:00
df71cd8876
ENH: add some params for multi extruder
...
1. Nozzle Volume and Nozzle Type support multi extruder now
jira:NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: Ie171b5105bd3830db3a992cadd365b785008c47a
(cherry picked from commit 2ebd14667e43dc745556f5e7bcbb7c2ccad4a007)
2025-08-24 23:18:12 +08:00
89ee40ab0a
ENH: calib support multi_extruder(UI part)
...
jira: none
Change-Id: I3009c2f8b601dc078cfed787dc3531fc1d4848d6
(cherry picked from commit 11f61abefaca6f0810e76266e50729432a3aa15e)
2025-08-24 23:18:11 +08:00
9aae7d2968
FIX: Clean up the code
...
1. Refactor recommended code for print by object
2. Calibration adaptation sends print command
jira: none
Change-Id: I24fd92d6aca07a7067e09bb200854e5bec72a324
(cherry picked from commit ad03fae1eba75a866d806a4319ef7edde2fb3562)
2025-08-24 23:18:06 +08:00
ccdf2f838e
ENH: calib support multi_extruder
...
1. backend support multi_extrude data structure
2. Compatible with third-party calibration
3. fix bug when get extruder in gocde export process
Change-Id: I5dac9abdd9907a521a1ba9b480f9e05640591bc1
(cherry picked from commit 21e6271e59ea8e4924866275566617d14a4b2b6e)
2025-08-24 23:18:05 +08:00
955cd4704e
FIX: backend get the extruder id based on filament_map
...
Change-Id: Ib7679c0fc67336e462467dab9f5b4d4684d6eb19
(cherry picked from commit dcd9fd501354da33baea2adc0f645fabe8880cf1)
2025-08-24 23:18:02 +08:00
53bcfc4a48
Fix inconsistencies on new translated strings ( #10310 )
...
* Unmark string that don't need to be translated
* Spellcheck
* Fix calibration strings consistency
2025-08-09 23:52:48 +08:00
4f891cb6fa
Update BBL network plugin to 2.1.1 which allows debugger again ( #10320 )
...
* Update to latest bbs network plugin, which should allow debugging
* Remove debugger detection and warnings
* Downgrade to 2.1.1 as 2.2 seems to be unstable
2025-08-05 22:57:41 +08:00
943a7ee68b
Merge branch 'main' into dev/bbl-network-upd
2025-06-17 20:43:27 +08:00
1538fa3502
Disable detect thin wall for VFA test ( #9912 )
2025-06-16 22:11:26 +08:00
76fcaa52b4
Merge branch 'main' into dev/bbl-network-upd
...
# Conflicts:
# src/slic3r/GUI/SelectMachine.cpp
2025-06-15 15:28:10 +08:00
de66749a11
fixes compiler warnings ( #9619 )
...
* compiler warnings: adds SYSTEM to [target_]include_directories to skip warnings originating from dependencies
* compiler warnings: uninitialized/unused variables, missing parenthesis, pragma
* compiler warnings: redundant template type, missing curly braces, pass 0 instead of NULL as int argument
* compiler warnings: removes fclose(fp) where fp==nullptr since fclose() has attribute __nonnull((1))
* compiler warnings: uninitialized variables, missing parentheses, missing curly braces
* compiler warnings: ? as lower precedence than <<
* compiler warnings: unused variable
* compiler warnings: unused result
* compiler warnings: undefined/unused variable
* compiler warnings: uninitialized variable
2025-06-14 21:05:25 +08:00
4bfe77bfff
ENH:Support more SD card states
...
jira:[for sdcard]
Change-Id: Ic09198a0ed357f827768ed2f8d8a9ed6266f749f
(cherry picked from commit c877405caba2b75c515c814b7aaa0793200eee04)
2025-05-26 14:41:43 +08:00
d46afc11a6
Fix crash when using old firmware
2025-05-24 18:37:35 +08:00
a62f50a59f
Update plugin version in PresetUpdater
2025-05-19 10:54:38 +08:00
8f1c150580
ENH: GUI: rename win_arm64 to windows_arm
...
jira: no-jira
Change-Id: I01eeb96efb06ec779f1338d1207f7f6641c2bc58
(cherry picked from commit bbf32fd6f7ffbf543c28882ff3801108942fb399)
2025-05-18 22:47:18 +08:00