Commit graph

382 commits

Author SHA1 Message Date
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
yw4z
73b93d2ed0
Compact Printer Selection UI (#11196) 2025-11-17 15:30:35 +00:00
Noisyfox
df734857cc
Merge branch 'main' into dev/p2s-pr 2025-11-08 20:46:30 +08:00
yw4z
b62187f076
Match UI of filament grouping & fixes (#11238)
* init

* update

* match radio icons

* fix background

* Show only on "summary" and "filament" tab

* delete unused icons
2025-11-08 20:44:37 +08:00
Noisyfox
4efaee4c98
Merge branch 'main' into dev/p2s-pr 2025-11-04 10:26:47 +08:00
githubber4ever
2ae3378605
toggle axis visibility on canvas (#9666)
Some checks are pending
Build all / Build Linux (push) Waiting to run
Build all / Build Non-Linux (push) Waiting to run
Build all / Unit Tests (push) Blocked by required conditions
Build all / Flatpak (push) Waiting to run
* toggle axis visibility on canvas

* set show_axes config on toggle
2025-11-02 00:23:26 +08:00
Noisyfox
ffddfb0559
Merge branch 'main' into dev/p2s-pr 2025-11-01 20:29:55 +08:00
yw4z
2b02a19404
Fix plate icons & filament grouping (#11222)
* init

* Update PartPlate.cpp
2025-11-01 20:20:25 +08:00
zhou.xu
07427de46b FIX:update svg
jira: STUDIO-13919
Change-Id: I92d8df5747cb2148f02a4ff3807c79c5f56d7537
(cherry picked from commit 8cf6c0e716c7f133664e5c10c8322c4ad89cc611)
2025-10-28 15:30:06 +08:00
Noisyfox
06fbd3c087 Update color 2025-10-28 15:30:06 +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
milk
f63cdc30e4 FIX:change interface for send
jira:[none]

Change-Id: Ia59bb1bb606399541aa191991ff0fb3f106d75d1
(cherry picked from commit b22af6cfe0a589ae5fa2e95a01ebe47f6742ee99)
2025-10-28 15:30:02 +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
songwei.li
69b2b5d86d ENH: Optimizing the extrusion compensation pattern of the X series
Modify the machine start gcode for nozzle diameters 0.2, 0.4, 0.6, and 0.8 on the X1, X1 Carbon, and X1E models to move the compensation lines closer to the edge.

jira: STUDIO-14317
Change-Id: Ib0662d5cf9dfd63b960fcb7c458fa35dc0954c1b
(cherry picked from commit 6aaa7ae4ffd2c893ed41a5eed51a6a7dd2d83f7b)
(cherry picked from commit 62bcdd5b1627526035ce3f23ca9999b958fd05b2)
2025-10-28 15:29:55 +08:00
milk
837d2af7e0 FIX:image alignment
jira:[STUDIO-14555][STUDIO-14125]

Change-Id: Iefd35c16fce9396d54bcb847291094346f987b28
(cherry picked from commit 2f1d921d8d76bc0235eca139801a106fca3c3cf6)
2025-10-28 15:29:54 +08:00
zhou.xu
be88fc5a84 ENH:modify svg
jira: STUDIO-13916
Change-Id: I1248bd0c367f49b6c3b6a9d8a3e5226cd7fac7e0
(cherry picked from commit 77278dc34175875e15f802e8e6023c6087e3a6c9)
2025-10-28 15:29:53 +08:00
zhou.xu
4e63907f72 ENH:modidy bed type
jira: STUDIO-13919 STUDIO-13920
Change-Id: I8e9e6bda972d294b91add1eeaf15061188bcdb2d
(cherry picked from commit a436da8930d631e094eef3b7829d270a027a9ac4)
(cherry picked from commit 5468697ff4ac4546111afdfd1f7eb43bd899f1de)
2025-10-28 15:29:53 +08:00
zhou.xu
11345d6b54 NEW:modify svg name
jira: STUDIO-13919
Change-Id: I8a7ae0df8c4203c8f00a0c0da83e98c1ec7be605
(cherry picked from commit 926809b06fe15e486f24c671af576d0a4dd13c37)
2025-10-28 15:29:53 +08:00
milk
164bd76762 FIX:add x1c and x1e picture
jira:[STUDIO-13716][STUDIO-14124]

Change-Id: Ia793986f1891c2ee57c95a6db536e71f725ddb3c
(cherry picked from commit e29b9cf3a319666c896fc839329448dde435c46d)
2025-10-28 15:29:51 +08:00
xin.zhang
6fcb6be65f ENH: update N7 images
jira: [STUDIO-12075]
Change-Id: Ia002bf1cd944b9a5e36f639eb80088327b446a60
(cherry picked from commit 0f31c70a832aeccbbfb6f712ef0a490951c3529c)
2025-10-28 15:29:51 +08:00
zhou.xu
59c2e222d8 FIX:Fix the image error of the hot bed
jira: STUDIO-14278
Change-Id: I3d0ee519b7ab057480cfde88be6b52d4f902b522
(cherry picked from commit af66ccee4e63074d4242f05792c1bc927c9ea2f8)
2025-10-28 15:29:49 +08:00
zhou.xu
e89817b263 ENH:modify bed type for machine
jira: none
Change-Id: I6ea5bd463918109763f6550188adbbc0733cedc6
(cherry picked from commit 41551af46371a5b7e340d8674d333b738b7f9d05)
2025-10-28 15:29:49 +08:00
xin.zhang
d4c885bf23 ENH: add resources for N7/O1S
JIRA: [none]
Change-Id: I20d5fc8f77e6d679ed28928997f1e07534f9dad7
(cherry picked from commit 4f9f0e034ddbcc9464a10e2d9d170d937204553d)
2025-10-28 15:29:49 +08:00
zhimin.zeng
8ca6484e58 FIX: Configuring auto calibration thumbnail using a configuration file
jira: STUDIO-12173
Change-Id: I16e984b679c0c6c169f4c4d208805237f97a3a25
(cherry picked from commit b61d4194311a09eca0294fe0aa3f11471ba924b3)
(cherry picked from commit f7c2223b71e0b7aaf7520501a96e0e120a373504)
(cherry picked from commit 96ddca220d8ff13941ebe13152a09cb7a1dd63a7)
2025-10-28 15:29:48 +08:00
xin.zhang
29eec843eb ENH: update printer view
jira: [STUDIO-12075]
Change-Id: I3b18940513b2628a45fb51d707921607ac1511a3
(cherry picked from commit acbc1fa3406563872ab4a4f79546fb7f530aef4b)
(cherry picked from commit 79f0f1a1fbede91df82175e6b8fe22457a622229)
2025-10-28 15:29:48 +08:00
Vovodroid
e922411371
Add instances (#6237)
* Add instances

* - Added a new menu item for converting instances to objects,

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-10-26 16:13:14 +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
SoftFever
3cb6da6f61
Part skip from Orca for Bambu printers (#10875)
Some checks failed
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
Publish docs to Wiki / Publish docs to Wiki (push) Has been cancelled
Ported part skip from BambuStudio. Thanks bambulab!

<img width="1350" height="902" alt="image"
src="https://github.com/user-attachments/assets/d7f89950-3420-4ea5-bbb6-e53c875e7422"
/>

Haven't fully tested yet!


### Minimum Firmware Requirements (from BambuStudio release page):

- **X1C**: v01.09.02.12 or later
- **H2D**: v01.02.00.00 or later
- **Other models**: Currently not supported. Feature support coming in
future firmware updates.

> ⚠️ Make sure your printer firmware is up to date to use this feature.
2025-10-23 23:46:39 +08:00
Noisyfox
6f36556eaa Merge branch 'main' into dev/h2d-2
# Conflicts:
#	src/slic3r/GUI/Preferences.cpp
2025-10-15 19:43:14 +08:00
yw4z
0493ed03a5
Preferences dialog redesign / improvements / fixes (#10665)
Some checks are pending
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
* init

* update

* update

* update

* update

* tooltips

* update

* fix tab colors

* update

* Update Preferences.cpp

* Update Preferences.cpp

* Update Preferences.cpp

* Update Preferences.cpp

* update "Auto backup" and "Downloads folder"

* cleanup

* update

* update

* update

* update

* update

* update

* Update Preferences.cpp

* update

* update

* update

* update

* Update MainFrame.cpp

* Update text.js

* log level selection

* move NetworkTestDialog to cpp

* Update Preferences.cpp

* Update Preferences.hpp

* cleanup create_item_switch

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-10-15 17:34:08 +08:00
Noisyfox
cf26243740 Update color 2025-10-12 12:53:13 +08:00
Noisyfox
f658aad7ca Fix dark mode visibility of the AMS dry icon 2025-10-10 19:51:52 +08:00
Noisyfox
83c167450b Some dark mode fix 2025-10-08 17:05:55 +08:00
Noisyfox
a9c0490c68 Update color 2025-10-05 16:02:17 +08:00
milk
6df1cde6d0 FIX:Add resource of printer
jira:[STUDIO-14273]

Change-Id: I2a0e5c638077ff732c23115366fd5410d331a812
(cherry picked from commit 13184e0a5d4a762f5bd50a8500f47d7de5199ce5)
(cherry picked from commit 3d56d1410f4942c0f0b1e10190a062193b8f42b1)
2025-10-05 00:07:41 +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
xin.zhang
9bf94b3d30 FIX: The image size
JIRA: [STUDIO-13426]
Change-Id: I2049e1f43f1042ddda7b47032f199e8676dde32b
(cherry picked from commit cb37126d4d4481bdb6786a7fbb3d6bdb3d71cc91)
2025-10-03 23:08:53 +08:00
xin.zhang
a781862fb1 ENH: add images for O1S
jira: [none]
Change-Id: I368b72fc745fe9b7858782a9d87a6a896a72acce
(cherry picked from commit e2dbd4fccef53588242b0fff704e28552cfaac83)
2025-10-03 22:33:29 +08:00
xin.zhang
fdae073072 ENH: update O1S files
jira: [STUDIO-11919]
Change-Id: Iab2e6b8a7162a718c69ccf5e043b3a87ee7d606d
(cherry picked from commit 4fcb5f4a4cfc5268165e2194c22454ffff2e14eb)
2025-10-03 22:33:25 +08:00
xin.zhang
ed13861cfd NEW: add images for O1S
JIRA: [STUDIO-11919]
Change-Id: I43f39dbd87514fea5ad8f43dbadb142cec1cfd46
(cherry picked from commit 9bc62966fbb2a931cafe16290b17f087cf1450d6)
2025-10-03 22:32:32 +08:00
xun.zhang
d609d8c23f ENH: add some pictures for O1S
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Icd22ecd58b4904aed0bc2c373ec8825f2c390e5f
(cherry picked from commit f54624daf3e854788e1b5a43100da3af09e1c01b)
2025-10-03 22:30:19 +08:00
zhimin.zeng
eb88d81362 FIX: modify cali thumbnail for O1S
jira: none
Change-Id: I7e255ce35e52fcf4a5e5d840edac24c339373454
(cherry picked from commit 46f09b97eaaa56da135ed4128d49e9d6927ec9cf)
(cherry picked from commit 89f5b517989a56fc77451b349e0a0b254c2117ee)
2025-10-03 22:29:30 +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
xun.zhang
1fd88842d9 ENH: add code for bambu lab h2d pro
jira:STUDIO-12107

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4a8132515ad947f68212d8002c0f365badf8ca71
(cherry picked from commit 76f50132fcae7ca91c689ceb484006db1e4f3dbd)
2025-10-02 17:07:20 +08:00
xin.zhang
0721078177 ENH: update humidity display for AMS-1
JIRA: [STUDIO-13195]
Change-Id: I7abcdf821b7ead2cf4a8605ecd95011e74f5dc6b
(cherry picked from commit 1c1d34ff7e3fea4492ba07e238ca171e28eb0a3b)
2025-09-30 11:19:59 +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
Noisyfox
c64ee8156c Fix crash 2025-09-26 22:29:23 +08:00
hemai
1928add5a1 FIX: partskip button display bug && cavas update bug
Jira: [STUDIO-12687]
Change-Id: Ibb42dab945be9b9b4b8b8ac8f2c268960d553325
(cherry picked from commit 15d8fb70c93d243a1592c050302e76867ed6582c)
2025-09-26 14:28:27 +08:00
hemai
df5bf0ae29 ENH: support parts skipping function
Jira: STUDIO-12687
Change-Id: I244cb611954590bd5e741f0d2701f359426a33a2
(cherry picked from commit e7e90e0f8ca0106a51d18d83efa0de56b332ddc0)
2025-09-26 10:55:19 +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