Noisyfox
|
760f66d3d7
|
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 |
|
Alexandre Folle de Menezes
|
77f7514d97
|
Fix spacing and punctuation issues (#11244)
|
2025-11-17 09:35:53 +00:00 |
|
Noisyfox
|
614612ed38
|
Merge branch 'main' into dev/p2s-pr
# Conflicts:
# src/slic3r/GUI/DeviceErrorDialog.cpp
|
2025-11-09 12:35:32 +08:00 |
|
Alexandre Folle de Menezes
|
14dd1078bf
|
Spellcheck translatable strings (#11242)
* Spellcheck translatable strings
|
2025-11-09 11:52:27 +08:00 |
|
Noisyfox
|
a594e5fa01
|
Fix failed to retrive PA calib result
|
2025-11-01 14:23:32 +08:00 |
|
milk
|
ffab04262d
|
ENH:Add thermal precondition
jira:[STUDIO-13970][STUDIO-13904]
Change-Id: I4b4fa27da1a65e0019c5f4c1dcc099c92189bf50
(cherry picked from commit 92dbde8385fec9719e0e9cfde764421793decd4d)
|
2025-10-28 15:30:05 +08:00 |
|
hemai
|
104cbb7b9b
|
ENH: support E3D print parts display
Jira: [STUDIO-14908]
Change-Id: Ie8273eb6f74a3e7508f440d2092bb48f2e1dbb10
(cherry picked from commit a4218e991e6367e3f1ee3802e785802df2ad6d41)
|
2025-10-28 15:30:00 +08:00 |
|
xin.zhang
|
c382a8a9c3
|
ENH: support_clump_position_calibration
jira: [STUDIO-14896]
Change-Id: I2913a1e4022686889aaa94ee31b787930200d02d
(cherry picked from commit 14370c8910878c2182189b42e013c1323615c310)
|
2025-10-28 15:30:00 +08:00 |
|
haolin.tian
|
0d01352658
|
FIX: fix typo error
jira: none
Change-Id: I46ec6aba4af57e3dfb8ef84f2f897bb24c064730
(cherry picked from commit 5c1f8f50ede08c822040d2fe2dd0c49e05a0d553)
|
2025-10-28 15:29:58 +08:00 |
|
hemai
|
4a51ef7f91
|
FIX: update proceed action ack param
Jira: [STUDIO-14689]
Change-Id: If424997b9ed05ab95f048424b8950f927ea9b608
(cherry picked from commit 8c712f49caf7a7f0d0fcef7a7c392170ae699ba4)
|
2025-10-28 15:29:57 +08:00 |
|
haolin.tian
|
aa75c444aa
|
NEW: print with emmc
jira: [STUDIO-14427]
Change-Id: I8b0c56ce1c2b7b90949b72c49acfdbb31c876df1
(cherry picked from commit 76e45bde2540ee418719e00b999c5fd724baec71)
|
2025-10-28 15:29:57 +08:00 |
|
xin.zhang
|
491100a9d2
|
ENH: support AMS switching for A series; clean class AMSSetting
jira: [STUDIO-14068] [STUDIO-14330]
Change-Id: I6281fbf56f3bf406ef28103998790a2a98c3f5c0
(cherry picked from commit 8ee02ec73076691c482ea6d089a49ea1c99ad10c)
|
2025-10-28 15:29:55 +08:00 |
|
hemai
|
2c675b1365
|
FIX: fit proceed action change
Jira: [STUDIO-14689]
Change-Id: Ia6a842b5b3bd542c25e67545528b847513d533f1
(cherry picked from commit 4cd33fded68797eb3098cb359ba1708b7f0c8bee)
|
2025-10-28 15:29:54 +08:00 |
|
milk
|
7608195e17
|
FIX:add idel heating protection
jira:[STUDIO-14359][STUDIO-14431]
Change-Id: I2ecb6c78c4b28d6f14c45dbb1f905b95a9d8c4ab
(cherry picked from commit f6eee61915b47321c1cb44e3ff2306875c32466b)
|
2025-10-28 15:29:54 +08:00 |
|
zhimin.zeng
|
21cd25d5af
|
FIX: the return cali value of filament is incorrect
jira: STUDIO-14552
Change-Id: Ic48445942afb66f674c92c12e7ab2b9510f7ac03
(cherry picked from commit c771bb2dbeb61ed8871cce01230735ddb9e69b8b)
|
2025-10-28 15:29:53 +08:00 |
|
xin.zhang
|
8863631c92
|
FIX: filament loading steps
jira: [STUDIO-14428]
Change-Id: I68612346ef9cb50e302323daa47421c22a87be97
(cherry picked from commit 9fb4b9b6a3a16b08d9dc52a4d6dbc15044275dcf)
|
2025-10-28 15:29:51 +08:00 |
|
hemai
|
9360733661
|
ENH: support proceed action
Jira: [STUDIO-13620]
Change-Id: I4ec96fc3adab517196b9725a54241575288c3bbf
(cherry picked from commit 240e26147917c32749427f31ebe7623500334ed6)
|
2025-10-28 15:29:50 +08:00 |
|
xin.zhang
|
fedcfc4ea5
|
ENH: support extension tool; support check extension tool
JIRA: [STUDIO-14122] [STUDIO-14162]
Change-Id: I147d335420fcc7c9a190f570863e38e138cdadcf
(cherry picked from commit db83b9fb6c6399d917b27b74cc573d668737c705)
|
2025-10-28 15:29:47 +08:00 |
|
hemai
|
a397a7378a
|
ENH: refresh nozzle info from studio
Jira: [STUDIO-13650]
Change-Id: I12dc26d5730c761ccc91d3a4a5f120d422d8a0ff
(cherry picked from commit 2bd7cd9a6a4d9c3370491fb4323a1aabe9a45578)
|
2025-10-28 15:29:47 +08:00 |
|
xin.zhang
|
1494731eab
|
FIX: check with internal filament type
jira: [STUDIO-14216]
Change-Id: I89e0d62b572872d7e2ea8e6e57ac662b64baf92b
(cherry picked from commit 6767c2334bbfcffa41d4d020ee4f2e183a327cee)
|
2025-10-28 15:29:47 +08:00 |
|
Noisyfox
|
b2047ba563
|
Merge branch 'main' into dev/h2d-2
# Conflicts:
# localization/i18n/list.txt
# src/slic3r/GUI/CalibrationWizardPresetPage.cpp
# src/slic3r/GUI/DeviceManager.cpp
# src/slic3r/GUI/DeviceManager.hpp
# src/slic3r/GUI/Printer/PrinterFileSystem.cpp
# src/slic3r/GUI/Printer/PrinterFileSystem.h
# src/slic3r/GUI/SelectMachine.hpp
# src/slic3r/GUI/SendToPrinter.cpp
# src/slic3r/GUI/SendToPrinter.hpp
# src/slic3r/GUI/StatusPanel.hpp
# src/slic3r/GUI/Widgets/AnimaController.cpp
|
2025-10-24 09:59:00 +08:00 |
|
haolin.tian
|
90830ab2ea
|
FIX: Sync AMS settings after device certificate installation
jira: STUDIO-14191
Change-Id: If4a02ed6f2c5ef111f0c7086b138e3dabc8ed1dd
(cherry picked from commit 172824c4b93f6b3eb197481efc38a262774ef313)
|
2025-10-05 00:03:56 +08:00 |
|
milk
|
72a64d7966
|
FIX:add interface line draft
jira:[STUDIO-13716][STUDIO-13717]
Change-Id: Ib8a4d919ebfab85e07b80e60c80e9271013d05b9
(cherry picked from commit cf3c37abc2629165bfcdb1eee5b00567acde3c83)
|
2025-10-03 23:08:55 +08:00 |
|
zhimin.zeng
|
62d94b1a73
|
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 |
|
xun.zhang
|
a543a55e01
|
ENH: some post commit after merge h2s commit
jira: none
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If0a36a4698c843a8a690f0fa0fcbbe5f6fafca79
(cherry picked from commit 9fcd26efff2d4b3f3e77faa11ab842664d25b75f)
|
2025-10-03 23:08:53 +08:00 |
|
hemai
|
bb43e312b3
|
ENH: support E3D nozzle flow type
Jira: [STUDIO-13934]
Change-Id: I3818c3881e8a926209f2bac321550f3c7a1a9f0d
(cherry picked from commit 5bb1c2e66ad5bddfcba6898d9bc330217e912e48)
|
2025-10-03 22:18:20 +08:00 |
|
xin.zhang
|
eb1eb7e81a
|
ENH: add new part: extinguish
JIRA: [STUDIO-11578]
Change-Id: I39dc15fe022f38d8c775c2675120bbbce05f95f3
(cherry picked from commit 25dc4e37e3681a840df9af7d98bbb134082492ab)
|
2025-10-03 21:45:14 +08:00 |
|
milk
|
2ac6ffa631
|
FIX:Synchronization information table
jira:[none]
Change-Id: Ia5f13645db7bc6ce92c7eb928ec36e2cad54e51e
(cherry picked from commit 79c929493ffbe3702615299c2cddf7b3645c8d88)
|
2025-10-02 18:12:02 +08:00 |
|
haolin.tian
|
6121a420f1
|
ENH: add text to specify active tunnel
JIRA: [STUDIO-13803]
Change-Id: Ia6af5ba881c93a1d284295b244d19b39aee2ae91
(cherry picked from commit cb6c6afeee3e519aca87ac82eacc4b85fda63f65)
|
2025-10-02 13:46:23 +08:00 |
|
xin.zhang
|
ac4b3696ab
|
FIX: check axis at home
jira: [STUDIO-13678]
Change-Id: If9363485ce2ccd434f5c22c0484c6420bbfb67c8
(cherry picked from commit 04e7e8d00f885fbe4ce4ff86ea2897c61e909881)
|
2025-10-02 10:00:13 +08:00 |
|
xin.zhang
|
d1d7e87f86
|
FIX: Skip the command result of other platform
JIRA: [STUDIO-13607]
Change-Id: Icfb87214278baccb4b97582ba46e4e439ffcdc02
(cherry picked from commit 09dfade232459f5663bebcadc39c90c3f132e6cf)
|
2025-10-02 09:45:49 +08:00 |
|
xin.zhang
|
4a787f6ff8
|
ENH: clean codes about device
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
|
2025-10-02 09:30:48 +08:00 |
|
haolin.tian
|
e17c8bfb80
|
FIX: remove legacy MQTT optimizations; disconnect previous printer on switch
jira: STUDIO-13455
Change-Id: I88f48801f443b3830fbd2bccbc53577f615e6d96
(cherry picked from commit 562ac1a3e7e75e1cab5e42ab09cec719bf698184)
(cherry picked from commit 5143086c5efb4d974e27ba4f55bd82752ded0a93)
|
2025-10-01 23:32:08 +08:00 |
|
Noisyfox
|
d05420615b
|
Fix crash when dismissing print error dialog
|
2025-10-01 23:32:08 +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 |
|
maosheng.wei
|
26dcf805e6
|
FIX: Reset Filament only when the preset is deleted from the current Studio
Jira: none
Change-Id: I2a8e17b17a97644d69013e38f50bb7b060b17e57
(cherry picked from commit 0c7e6b6676a1fc595e9b99e22d6c9cd00608c314)
|
2025-09-30 14:11:46 +08:00 |
|
hemai
|
5f1ff2f9a9
|
FIX: change AMS n3s ams_id & tray_id from 512 to 128
Jira: [STUDIO-13477]
Change-Id: I3844cb59df18220a22d8ff7524216b9fff2b6632
(cherry picked from commit 8c7b66d24b1e795c3070883f3f439cf160b38037)
|
2025-09-30 14:08:47 +08:00 |
|
xin.zhang
|
a5c6450cc5
|
ENH: support command error dialog; support clean print error; support stop ams drying
JIRA: [STUDIO-12441] [STUDIO-13123] [STUDIO-12372]
Change-Id: I87170f1f51c1e24f6eee61deb07d06ff6b53a884
(cherry picked from commit 1ec5382f14ebf06d8f3ed128e377243665434ca6)
|
2025-09-30 11:27:16 +08:00 |
|
tao wang
|
28f5c3e952
|
ENH:support printer connection in farm mode
jira:[none]
Change-Id: I05a67e5ff508d21ed9aa1659147c510bd1700b10
(cherry picked from commit 0cf5ca920851735f946b5dd733472009f4dc17de)
|
2025-09-30 10:50:53 +08:00 |
|
milk
|
73220b4df6
|
ENH:Syncing print action text
jira:[STUDIO-11406]
Change-Id: I8ef48345ee57cc66868a05f9e468f857a66d4feb
(cherry picked from commit 0e9e4a2f32c0b3ce38eb7e9bf9a0d0bcd3e39e66)
|
2025-09-30 10:09:03 +08:00 |
|
xin.zhang
|
1331e51dae
|
FIX: The value maybe string or int
JIRA: [STUDIO-13018]
Change-Id: I4af161431fb51e1e0234bc37de8346b45f3ca4b7
(cherry picked from commit 4e2934685033c352ea2c3baded585381c285a90d)
|
2025-09-30 09:41:45 +08:00 |
|
haolin.tian
|
d6e87fc0b7
|
ENH: delete useless function, delay start_device_subscribe after mqtt_connect called
jira: [STUDIO-13135]
Change-Id: Ibce80b043d08f6c1c7baa6611c3cfa2f0c85f2f5
(cherry picked from commit c2ff073525937fb571ea8d3bfae55231adaa691d)
|
2025-09-30 09:11:39 +08:00 |
|
zhimin.zeng
|
7f71c59490
|
FIX: Upgraded P1P to P1S shows up again as a P1P
jira: STUDIO-12944
Change-Id: If234cbd96cffa547e9cae47a71875efd1b097a25
(cherry picked from commit 2fa053dadef5750d1888743866ebca2867c85f7a)
|
2025-09-29 23:46:13 +08:00 |
|
hemai
|
a7ad18e66e
|
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 |
|
zhimin.zeng
|
ba4cc19e6c
|
FIX: the info cannot displayed in Chinese language
jira: STUDIO-12985
Change-Id: Ic2d52bc94129c2c568ebc4b3dc2b0a3fe5a65907
(cherry picked from commit 209c29400ca203e4ccd26863d2b78d5802275131)
|
2025-09-28 14:58:53 +08:00 |
|
xin.zhang
|
fcbad94b91
|
FIX: check filament type instead of filament id
jira: [STUDIO-12954]
Change-Id: Iab008c698e6c71a6df2ac4a81801681eb4b94d6c
(cherry picked from commit 295a6d51ab2f59bfeef84e9ff33dac3c0aea1d93)
|
2025-09-28 14:57:48 +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 |
|
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
|
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 |
|
hemai
|
ddf6ed00c5
|
ENH: if nothing selected then disable aplly btn && update plate index parse
Jira: [STUDIO-13299]
Change-Id: I1ce7271d005f7fec4d71ece9db13916a9fcc1e1d
(cherry picked from commit b2386964814dee68a1936da912eea339f5317ddc)
|
2025-09-26 14:30:21 +08:00 |
|