Commit Graph

404 Commits

Author SHA1 Message Date
Noisyfox
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
SoftFever
565ac58fd5 Revamp OrcaSlicer updater (#10884)
* Revamp OrcaSlicer updater
2025-09-28 10:33:33 +08:00
xin.zhang
7159e74e70 ENH: supporting encoded filament color
jira: [STUDIO-12346]
Change-Id: I7f5ce7806acb6fdeb3e3d9db52a0b96e5fadd759
(cherry picked from commit a7bdc2707d3825327258965c90c33836a7da628b)
2025-09-25 17:36:29 +08:00
tao wang
ff067b9dc2 FIX:fixed the issue of using the wrong tunnel after reconnrction
jira:[none]

Change-Id: Ief1e79a753b051e859697b523eb1ba230f154ae2
(cherry picked from commit 0d9f48c5aae2c340e8b1c4fadb42c331ae9486f6)
2025-09-23 17:22:26 +08:00
xin.zhang
87ab07a948 FIX: update the bitmap of icon for dark mode
jira: [STUDIO-12180]
Change-Id: Ib39f723be9b1f02f2f0dd21204d7831627481528
(cherry picked from commit 73d9f515de93d324c74878f3ceea5ee0f7049073)
2025-09-23 17:19:56 +08:00
Stone Li
ec4a879235 ENH: add more retry to subscribe
Change-Id: If68249408446aace4a83e4b5beeb0643dce8cb87
(cherry picked from commit 8b0f16d3de8ef6816bf5eb068e007d202f9710c9)
2025-09-23 09:40:04 +08:00
tao wang
da8da58d52 ENH:auto switch to using local broker for data transmission
jira:[STUDIO-11616]

Change-Id: I91066a629684dcff4efc73f310c2e0a7843954f4
(cherry picked from commit ac805e7d9150f56d40ec261fd2ed4007e1413b8e)
2025-09-23 09:20:15 +08:00
Noisyfox
aad5a1897c Revert "FIX: support auto-reconnect for MAC power awake"
This reverts commit bb13f1e904.
2025-09-21 21:59:07 +08:00
jiaxi.chen
c2ecae7f17 ENH: popup more informative message with support materials
1. Remove popup message with PVA
2. Add popup message with PETG
3. Encourage users to print both support base and interface with Supp.PLA

jira: STUDIO-11984
Change-Id: I7be5d033e47939b9b80ddb99635b2abbb8c848d5
(cherry picked from commit c7d05861270f925411256d8ce20093ec1701230a)
2025-09-21 16:27:29 +08:00
xin.zhang
6974de9b84 FIX: show message while enable multi-machine
jira: [STUDIO-11980]
Change-Id: I140d2d3f07c217465a2a5b6a0cec09f96135093c
(cherry picked from commit be241bcdcc5ca66d231b646b33dfa87a5ee129f3)
2025-09-21 13:48:07 +08:00
xin.zhang
1e9f94a9c1 FIX: remove the restriction of load ams list
jira: [STUDIO-11667]
Change-Id: I9bc22e24138431cb3d94feacd64396208463da2e
(cherry picked from commit 9da39db1d6a850328f668c7601521f3323c46a07)
2025-09-21 13:48:01 +08:00
zhou.xu
9ced9b9dbc ENH:ban gcode to send print
jira: STUDIO-10518
Change-Id: I5958fe1bfea9a133d3adde6b0e64289f7ceb0f52
(cherry picked from commit 4b96f09a75ec07a756da55ace2ac7f6447c2681f)
2025-09-21 13:48:01 +08:00
xin.zhang
92044cea9a ENH: default to reconnect, not check the out of date object
jira: [STUDIO-10820]
Change-Id: If3c332acab8fc91f60b35de6be367d310c8d7a9d
(cherry picked from commit 6683df367fd8a5713bca75bf7bfd29b1e070eeba)
2025-09-21 13:47:59 +08:00
xin.zhang
1c10554e67 FIX: support auto-reconnect for MAC power awake
jira: [STUDIO-10820]
Change-Id: I0a7c554dc9eae4aa0f71cd1c3dabacdcd465792f
(cherry picked from commit 582e3778361b9a51b1a95c761ecf5dd7f15e7763)
2025-09-21 13:47:59 +08:00
zhou.xu
f473c54467 FIX:Plugin first fails to install Mac
jira: STUDIO-11242
Change-Id: I9c3484e18c3da75a5dee62523e32ac6ad6c9b207
(cherry picked from commit d5d4dc46386894b636c189da15978df11f8393c0)
2025-09-21 13:47:52 +08:00
xin.zhang
4fa56b61a8 ENH: move some level
jira: [none]
Change-Id: Ibd0d380b16b30f63144d38a0c34972d8b7c4153f
(cherry picked from commit 2da69efd9b0db6c2be6a1b3985bbafb7afc5d3be)
2025-09-21 13:47:50 +08:00
zhou.xu
51b887fc43 ENH:add "is_blocking_printing" api
jira: github 6181
Change-Id: I8c8659da0b27204c53d03cbbd8d410504b3fd434
(cherry picked from commit c52681071782d137338436640cd990057579949b)
2025-09-20 15:30:09 +08:00
xin.zhang
8126d2f323 FIX: move the flag
jira: [STUDIO-11069]
Change-Id: I856225577243cd58e3111c71915049828e72dc00
(cherry picked from commit 8f5205a34cf8f790f9e395ccd744baf15041f7fb)
2025-09-18 17:05:21 +08:00
xin.zhang
2b0a799596 FIX: the ext does not support filament backup; add protection
jira: [STUDIO-10812]
Change-Id: I01b6de1e23d00932b373920105542b8e8770e809
(cherry picked from commit 19697b2dcd2a4f20d977379cc76dff8e02e938f2)
2025-09-18 11:06:11 +08:00
tao wang
747a6ec5a5 ENH:optimize the logic of the IP input window
jira:[STUDIO-10375 STUDIO-10534]

Change-Id: I75ff12403dbf8f59fa95c938fa97ec2497f0ed67
(cherry picked from commit b62efed65f26b1ea4390c2d1e8681169e63fff99)
2025-09-17 21:23:22 +08:00
zhimin.zeng
029f92fc56 FIX: the machine status is not refreshed after unbinding in lan mode
jira: STUDIO-10017
Change-Id: I62f955c47fbf7c59782ec8a7a7e316ef020942a5
(cherry picked from commit 66b5ef0d86f0212b4843cabed9fe408127a219cf)
2025-09-12 17:39:16 +08:00
zhimin.zeng
a1c5534bda FIX: the machine status is not refreshed after unbinding
jira: STUDIO-10017
Change-Id: I351a17abac132369ecf342ffb79b17228d5ef250
(cherry picked from commit 4a01c840ab73a455e1580169f57c25b10fa9e85f)
2025-09-10 16:37:11 +08:00
chunmao.guo
7f9ef78eba FIX: something
Change-Id: I2923786337f97f4297b0444522c620891aa2ad90
Jira: STUDIO-9725 filament menu delete icon
Jira: STUDIO-9785 StaticGroup border color
Jira: STUDIO-9716 update badge icon
Jira: STUDIO-9815 click printer/bed panel for combobox
Jira: STUDIO-9867 label with for single noozle
Jira: STUDIO-9739 ams page up/down
(cherry picked from commit 1cde0b844a97f3420db4999927f05a833b92b0fb)
2025-09-10 10:43:06 +08:00
xin.zhang
222921caec FIX: update HMS to support multi-type machines
jira: [STUDIO-9582]
Change-Id: I5ad4083d666db4237d355ac8bd8160afb8e8a35f
(cherry picked from commit 954a27016953bcf4f07b2a3e14ac1f5faf68c644)
2025-09-09 10:46:37 +08:00
chunmao.guo
bbf294fdf0 ENH: call Bambu source deinit
Change-Id: I7b96056aabe7a894c66fcaf61e24f783f5a1e217
Jira: STUDIO-7666
(cherry picked from commit 9f85798a0bc8d02b3f0a30fd42934f58b48e67e9)
2025-09-07 23:24:38 +08:00
chunmao.guo
843057351d FIX: reset bambu lib after restart network plugin
Change-Id: I4a3a4b7420745835ca3fa00c6edebe9d8d98cbf6
Jira: STUDIO-7571
(cherry picked from commit 28d9c6743fae80bfd40e4ee391e30d62cb16d4ab)
2025-09-07 23:19:41 +08:00
xin.zhang
cc2b062dbd FIX: the single AMS failed to show
jira: [STUDIO-9445]
Change-Id: I8a565f50a109355f85a66567d242998b26fa4bdc
(cherry picked from commit 5ca6d99fd697144eb50e06436a3296ab91880287)
2025-09-07 00:49:19 +08:00
zhou.xu
3facb2e085 ENH:export system and graphics cart info to log
jira:none
code is from PrusaSlicer,thanks for PrusaSlicer and Lukas Matena
commit e04e8c55cfc0498bb665f6fb515f3a8fcea64796
Author: Lukas Matena <lukasmatena@seznam.cz>
Date:   Fri Dec 2 14:21:18 2022 +0100

    Improved performance of GLModel::render:
    The way the OpenGL version was checked was quite inefficient

Change-Id: I6d7c6678e383c5cf2fbfea5b61ef65beab5328f9
(cherry picked from commit 3e938c9216c07ad0c50b763851d7dc9aa906162d)
2025-09-07 00:15:14 +08:00
chunmao.guo
edda69fc14 FIX: install plugin keep folder struct and symbolink
Jira: none
Change-Id: I079a3161e9b416ab3b2db52af63de9adff6be5af
(cherry picked from commit 448ce1efd87ff1fd46faeb87aa01daa376a09678)
2025-09-07 00:01:49 +08:00
lane.wei
e942de4b61 ENH: config: remove unused custome_defined logic
also improve project_embedded
1. remove unused is_custom_defined
2. improve project_embedded to support multi-extruder diff

jira: no-jira

Change-Id: I1db28c3cfd59ccc31c6855af30305396c71c4e9a
(cherry picked from commit 0434853bf32b063f7850fd4e0c9c3a6045375225)
2025-08-24 23:18:06 +08:00
lane.wei
35a94e37cb ENH: config: add filament_maps in partplate
Change-Id: I1183830788e703f1d33a8a4b620b58b822283dd4
(cherry picked from commit b0e3ab037e3f5af0851539af5ac15b8f96daf548)
2025-08-24 23:18:01 +08:00
SoftFever
4031b7db11 Refactor folder (#10475)
Move many third-party components' source codes from the src folder to a new folder called deps_src. The goal is to make the code structure clearer and easier to navigate.
2025-08-22 20:02:26 +08:00
Noisyfox
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
Noisyfox
4acda7d003 Do not connect to default BBL device during app startup (#10214)
* Do not connect to default device during app startup

* Connect to last selected machine automatically even if it's lan machine
Simplify default machine connection logic

* Select last machine automatically when available

* Check for LAN connection state after updating combobox selection.
This matches the logic of `SendPrint.cpp`.

* Avoid showing same error message multiple times until next connection attempt.

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-07-26 00:18:56 +08:00
Noisyfox
f1af2a1cc2 Merge branch 'main' into dev/bbl-network-upd 2025-06-16 14:02:04 +08:00
Alexandre Folle de Menezes
5f4b129ef4 Fix english strings punctuation mistakes (#8901)
* Fix punctuation of enumerations

* Add missing '?' at the end of questions on hints

* Add periods after error messages

* Add punctuation to all tooltips

* Add missing periods on the pt-BR translation
2025-06-15 16:12:03 +08:00
Noisyfox
76fcaa52b4 Merge branch 'main' into dev/bbl-network-upd
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
2025-06-15 15:28:10 +08:00
Dipl.-Ing. Raoul Rubien, BSc
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
Noisyfox
8ef18bad2d Log network msg 2025-06-02 21:20:43 +08:00
noisyfox
4e21d0e545 Add debugger detector for Linux 2025-06-02 16:48:58 +08:00
Noisyfox
14063968d8 Add debugger detector for macOS 2025-06-02 16:17:11 +08:00
Noisyfox
f9301902e0 Only download ARM version when not using legacy plugin 2025-05-19 10:51:55 +08:00
lane.wei
7f9280eb85 FIX: app: fix the crash issue on win-7 again
jira: no-jira
Change-Id: I96e713513270270db3abcfdd67792b0a3ac92619
(cherry picked from commit caff5d9f38cdb962ca4069f8b0b5696d140aac6d)
2025-05-19 09:58:52 +08:00
lane.wei
7fa58a8dbc FIX: app: fix the issue on win-7
use typedef instead of IsWow64Process2

jira: no-jira

Change-Id: I3d5c4becca1586094b6950431470b12bd71a0056
(cherry picked from commit c34e985f188c206d588ee8da7149ded2516981cf)
2025-05-19 09:58:46 +08:00
lane.wei
7bdff75f9b FIX: fix studio not launch issue on windows-7
jira: no-jira
Change-Id: I531e009c0547d3a5d86d48e990d930eb8fa6ba00
(cherry picked from commit 3d02f03ef4ba229ebf9e28cd99a5d871916994dd)
2025-05-19 09:58:06 +08:00
lane.wei
3d3f3ed331 FIX: GUI: use another api to get process type
jira: no-jira
Change-Id: I43fb1738b9b0173704c17c0d92df06f3c78fcde6
(cherry picked from commit af8926ea396480ea06222d421a2ecb704df04218)
2025-05-19 09:56:56 +08:00
lane.wei
1556fb0619 ENH: init: output the process architecture when init
jira: no-jira
Change-Id: Id5acb828269565945d887c6de4e32d715f83f503
(cherry picked from commit a29cb80bc7f959b5df44238a0a7f0a08948ff2a3)
2025-05-19 09:54:24 +08:00
lane.wei
50b7aa23ad FIX: gui: fix the crash issue on arm64 plateform
jira: no-jira
Change-Id: Ib95ffc3ceb421af345418d73af0261d3c25464a3
(cherry picked from commit 132d87b687f4b3bd016539380d7e9268d817ac40)
2025-05-18 22:47:42 +08:00
lane.wei
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
lane.wei
d3640901f2 ENH: GUI: add arm64 check logic for windows
jira: no-jira
Change-Id: Ic788d4ae9218b909eae5ce571d4436c39e77230a
(cherry picked from commit 323184e42c5f85c8738b03b890e5aaf3818e8858)
2025-05-18 22:46:50 +08:00