be2fe13578
Fix wxEXPAND | wxALIGN_* sizer flag conflicts for wxWidgets 3.2+
...
wxWidgets 3.2+ asserts on invalid sizer flag combinations where
wxEXPAND (which fills the entire space in the secondary direction)
is combined with wxALIGN_* flags (which are meaningless when expanding).
Remove the conflicting wxALIGN_* flags from all 112 occurrences across
21 files, keeping wxEXPAND and any non-conflicting flags intact.
2026-03-24 20:50:44 +08:00
e71252977b
Fix GUI strings that should start with uppercase ( #12499 )
2026-02-27 11:19:22 -03:00
dc889e387d
Merge remote-tracking branch 'upstream/main' into dev/p2s-pr
...
# Conflicts:
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/PrePrintChecker.cpp
# src/slic3r/GUI/StatusPanel.cpp
2025-11-18 09:17:13 +08:00
42d063fc8d
Fix spacing and punctuation issues ( #11244 )
2025-11-17 09:35:53 +00:00
27a471cea1
Merge branch 'main' into dev/p2s-pr
2025-11-17 14:56:09 +08:00
a0d4a9829e
Standard units need translation for CIS Languages ( #11376 )
...
* Standard units need translation for CIS Languages
2025-11-17 10:29:44 +08:00
c31b039dc4
FIX: support retry when flow rate cali failed
...
Jira: [STUDIO-14271]
Change-Id: I0aa52e97412f29de1630e19c13f57e93763f4c7c
(cherry picked from commit 161daf87cf1e80a7c6f8f9bc6d07435bf8b0f9d1)
2025-10-28 15:29:51 +08:00
05aedd6d92
Update color
2025-10-05 16:02:17 +08:00
6401450b0b
FIX: update ams select handler for single extruder
...
Jira: [STUDIO-14218]
Change-Id: I92ae9192162fbd614ddc8d0f640de5940f7cd24f
(cherry picked from commit c46e6f2b9f68c30268a5c8f557f793935919a6df)
2025-10-05 00:05:16 +08:00
7b464e678c
ENH: support new auto cali method
...
jira: STUDIO-10798
Change-Id: Icb47d8502739f0d4217486e2d1805cd609cee67b
(cherry picked from commit 6c2841e57f083cbc6d75eea2af55a8f78d2fa8df)
2025-10-03 23:08:55 +08:00
5280ec1fdb
FIX: add nozzle volume type for single printer
...
jira: STUDIO-12765
Change-Id: If1134e759c16a162537241e9e9b7db084263fb97
(cherry picked from commit 3a7d55e713117ee8249b2f67e2f399fa0b8a3b70)
2025-10-03 23:08:47 +08:00
e0a41554e6
ENH: support new auto cali method
...
jira: STUDIO-10798
Change-Id: I9490b050e93cd556e1d34b1e69e0508eaecec2cd
(cherry picked from commit 7a8b34525ef77d49b6549ecb290e2b1f89c69419)
2025-10-03 23:08:47 +08:00
2c20cbce11
FIX: extend max ams num of per nozzle align with printer
...
Jira: [STUDIO-13786]
Change-Id: I178766bce3926bf3c33f256b88c769826d48fc43
(cherry picked from commit 2a07c8fea76ee6130cce07c1a72c73f085d5390a)
2025-10-03 22:13:05 +08:00
aae50ecd58
ENH: clean codes about device
...
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
2025-10-02 09:30:48 +08:00
a913f9b575
FIX: support calibration for multi-nozzles with different diameters
...
github: 7543
Change-Id: Ifa20d786836f1991af35b3b95e25f91431d752e0
(cherry picked from commit 0c1053e962c928b253c268fc6658b8ec98f692ff)
2025-10-01 22:01:50 +08:00
895d155e1b
FIX:clear wxwidgets asset
...
jira: nojia
Change-Id: I8ba2849afa07bc162a55b326c3d9a45150243ac3
(cherry picked from commit 96ba14c86d3cf180eeb585185d31bcb5d5db7415)
2025-09-30 14:34:08 +08:00
62b1d05e53
FIX: the encoding of filament check_ams_filament_valid
...
jira: [STUDIO-12251]
Change-Id: Idc3d23dce67d3e835f15c47984fdd68041371d61
(cherry picked from commit 42b15b4d41a099c5f1aca9dd59ac592aafba0b43)
2025-09-24 11:14:42 +08:00
2422ad8013
FIX:WxColour (0x00AE42) represents bgr input, incorrect use
...
jira: STUDIO-12347
Change-Id: If03e23f2ee7cbb5dcb124453fb0a1ea67c3633a0
(cherry picked from commit 8a22fab6d73fe2694b5006712d5e72619ddea51c)
2025-09-24 10:40:45 +08:00
b38145a291
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
19372977d1
NEW:add pre print checker
...
jira:[none]
Change-Id: Ic1469d30dff30e1eba92d8bfacf58d0f0b789157
(cherry picked from commit 8cfa735c6cac432a2b97dea7703e810f8eef6d04)
2025-09-21 13:48:03 +08:00
ccb6d7df3f
FIX: cali crash when using tpu in left extruder
...
jira: STUDIO-11535
Change-Id: I1f979346748210c9af16931fce107efb8f9e4fd7
(cherry picked from commit b9a040f2edfd3118d84ea565715666b0e6090a68)
2025-09-21 13:47:59 +08:00
0e921f02d7
ENH: refine check logic for filament mix printing
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com >
Change-Id: I199462cee6284e13e58f829b7972dd3124bfc385
(cherry picked from commit 22834b23586d2230e94e9dffd8b09146e5342246)
2025-09-21 13:47:58 +08:00
9d707c8b54
FIX: fix the error display for ext slot
...
jira: none
Change-Id: I940554e6b1a5c8c609561670db79948c9efed63d
(cherry picked from commit 72b5ab7ee4f59287dd1888c1c4a1f86466fc1afe)
2025-09-20 15:31:33 +08:00
e1a46aa398
ENH: Updated calibration UI for single-extruder printer
...
jira: none
Change-Id: I4e2d97f38699b13e2bced8f6a37c952f7903aa27
(cherry picked from commit 2e3a5e8ca71e3e9426412f8bd07b916f6be45aed)
2025-09-20 15:31:26 +08:00
b6c726f39b
FIX: modify some text
...
jira: none
Change-Id: If3f90adda34bc3088f7a43ccf294d82c14180263
(cherry picked from commit 5b056ee0aea62f53688574b06b9424d140e69fa5)
2025-09-18 16:44:34 +08:00
051f8b1737
FIX: move network hold to MainFrame
...
jira: [STUDIO-10994]
Change-Id: I2c30ba3b0f17d52079332634a9a2dd138859e083
(cherry picked from commit 506e82cb02a79d97a30effde53fe85c7d278858c)
2025-09-18 16:22:57 +08:00
d0fe52fe8b
FIX: The original data of combox is not cleared during initialization
...
jira: STUDIO-11005
Change-Id: Id5b7259b517a515c2f641ce32998f09e182902ff
(cherry picked from commit ad1f6bdca48fd45ea7cedac15518a5ebe73ba386)
2025-09-18 16:20:26 +08:00
1b04d10002
FIX: the pa profile name cannot be repeated when edit k value
...
jira: STUDIO-10992
Change-Id: I50d61e9581e188a10a4f804df163b3d50eb7caa0
(cherry picked from commit 431925adf0749faafeaf46ac0b8d60c6d4e5972a)
2025-09-18 16:17:58 +08:00
ac82df15b8
FIX: show message dialog when the machine's nozzle in unknown
...
jira: none
Change-Id: Ic9b0e668c5e8427df76503731865d1b3de8568c4
(cherry picked from commit d38cbada3e311470594615ee714b51d47a51c54f)
2025-09-18 16:04:52 +08:00
9c0627d2df
FIX: add show status for cali when storage is not available
...
jira: STUDIO-10865
Change-Id: Ibc4d15e0f8d32694d389c68fa300b6ed95030818
(cherry picked from commit 48e2efdc2fdd43ad852d7f1ffc0a11af0714bc14)
2025-09-18 16:04:46 +08:00
f48ac2bafc
ENH: add sync status for sync button
...
jira: STUDIO-10676
Change-Id: Ia3afd0a1f09fa3f27b1f04c84ec9a427f74edf31
(cherry picked from commit d707fd04c3ebdb9fe6787b90cd661b4b121762c3)
2025-09-18 11:07:23 +08:00
c6162067db
FIX: Calibration limit left and right must be the same diameter
...
jira: none
Change-Id: I3ea572184a122abeaee882742eda8b75fb21c30d
(cherry picked from commit 79165e1ad484f18ab376ce5451a58e729c2b3100)
2025-09-18 11:07:18 +08:00
122c35860e
FIX: cali should not send job in lan mode
...
jira: STUDIO-10625
Change-Id: I89227b9f3c06416abe7895fa3edb47358891d573
(cherry picked from commit 6029e4bc5e90094d6dbce08dbb4f47757453dad0)
2025-09-18 10:42:49 +08:00
99ebf305d5
FIX: N3S should only show one slot
...
and fix crash on calipresetpage
jira: STUDIO-10669
Change-Id: I93aecdcc360d47baa72ef08af711f3d06206d5e2
(cherry picked from commit 926cfb14d28a196082b2437ace182e960c0c66c2)
2025-09-17 23:09:23 +08:00
7723fc5c4b
ENH:support checking blacklists for specified models
...
jira:[none]
Change-Id: Icd88c478a04e8743cdaaa8d670f238b534e40283
(cherry picked from commit c3643fdec9c0fcbceeba71f9ef5cd2de0cf7957d)
2025-09-17 17:38:52 +08:00
a73153e5ed
ENH:fixed incorrect prompt for glow material
...
jira:[STUDIO-10574]
Change-Id: I4475eb527ffbc8cc6d72405445552971d062b45e
(cherry picked from commit 01918affdfb69879f86ca47fe2f1ab8af5e1311b)
2025-09-17 17:09:21 +08:00
af37dd6524
FIX: add log for cali_sync_button
...
jira: none
Change-Id: Id6f7030ec8476e8dc209b4e7bb88ec4531f2013a
(cherry picked from commit ebc30a7769b84b507514ff11d270104848e4b450)
2025-09-17 15:49:03 +08:00
5f33cc87b8
NEW:added inspection of pla-glow material
...
jira:[none]
Change-Id: I1a62992e24665b83f54981e59edc1ba1fcda9a8a
(cherry picked from commit fa2fc22f3e648c0f0f485d1a7e701658693da457)
2025-09-17 11:16:10 +08:00
fa18b06b71
FIX: H2D only displays supported heated beds on cali page
...
jira: STUDIO-10287 STUDIO-10433
Change-Id: Ief38584243a0ee836f9ba4541d2bb9eaa6343c1c
(cherry picked from commit 6a7d281d0df32d4232ba4da7260a696dc4a84594)
2025-09-17 10:03:44 +08:00
050279c707
FIX: fix some size error on dpi changed
...
jira: TUDIO-10053
Change-Id: Icd93aa0dd9a2c693d7b957f9ede5c6dafc415352
(cherry picked from commit ce65273dc0fc9bc3f23dc54b01e4dcc92d92483c)
2025-09-16 21:21:40 +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
5ddd2203a9
FIX: fix some translation and style issues
...
jira: STUDIO-9777 & STUDIO-9726 & STUDIO-9717 & STUDIO-9720
Change-Id: I05e6df6bb1416988a1862fc589058241d5344a58
(cherry picked from commit d833ab7d48729b527748662872df1ec33567b5ab)
2025-09-10 07:25:19 +08:00
d3953f2284
FIX: fix crash when cannot find preset
...
jira: STUDIO-9422
Change-Id: If81e1ac9379ccbc4b40cbda5cf8cb876ea230173
(cherry picked from commit 758d37d0807288cf63fa2b7487a65d7097b94e8e)
2025-09-07 00:12:32 +08:00
5e11c465cb
FIX: modify cali text and picture
...
jira: STUDIO-8778 STUDIO-8824
Change-Id: Iecb0a52a100c3f0765e5eda07e0ed50226490e42
(cherry picked from commit 16791c72d62eabef96011ddc117b329385c5aa68)
2025-09-07 00:12:26 +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
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
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
