juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 09:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,999 Commits 17 Branches 77 Tags
107c2dfbbdbe8e6aff665bb7fc782e36aa0f0921
Commit Graph

76 Commits

Author SHA1 Message Date
glowstab
9956ad5b48 X2D Support (#13388) 
# Description

Adresses #13294 

- Adds the X2D printer definition, machine presets, process presets,
filament presets, BBL profile index entries, CLI config entries,
filament blacklist updates, and printer/load/calibration/cover assets.
- Updates dual-nozzle handling to use configured toolhead labels and
match Bambu X2D hotend placeholders.
- Adds X2D-specific wipe tower cooling placeholder support and 3MF
filament/nozzle change sequence metadata import/export plumbing.

# Note

I own a P2S and an X2D. That's all. I frankly have no idea if my changes
cause regression on other printers, and have no capability to test. I
know that for my X2D, which runs an AMS, .2mm nozzles, SuperTack, and in
LAN mode, this has been working without issue.

# Screenshots/Recordings/Graphs

<img width="606" height="380" alt="Dual nozzle control"
src="https://github.com/user-attachments/assets/0d1c1063-4621-4097-b97c-d739557bf18c"
/>

*Dual nozzle control*

<img width="726" height="260" alt="image"
src="https://github.com/user-attachments/assets/270355b7-ca67-4ca3-ad19-582b8f11411b"
/>

*Multi nozzle filament override*

<img width="416" height="202" alt="X2D Machine config and dual nozzle
support"
src="https://github.com/user-attachments/assets/6a5c07b2-0d20-4819-8f42-d60731313249"
/>

*X2D Machine config and dual nozzle support*

<img width="397" height="142" alt="Filament for Supports test prints"
src="https://github.com/user-attachments/assets/3c7546bd-0e27-4d56-89b7-d9ca18c976f9"
/>

*Filament for Supports has been used in over 20 hours of test prints*

<img width="210" height="263" alt="Left vs Right filament distinction"
src="https://github.com/user-attachments/assets/03322268-b669-4f14-8d77-c4d96843d219"
/>

*Left vs Right filament distinction*

<img width="557" height="327" alt="Custom filament mapping"
src="https://github.com/user-attachments/assets/c1c4396f-7359-474e-80bd-78fec22f9c82"
/>

*Custom filament mapping*

<img width="556" height="314" alt="Auto map"
src="https://github.com/user-attachments/assets/d83e3217-edce-4340-886e-043962003a30"
/>

*Auto map*

<img width="689" height="664" alt="LAN mode send print with X2D preview
and no errors"
src="https://github.com/user-attachments/assets/76009bbf-31d3-4a6c-979c-8643b487c824"
/>

*LAN mode send print with X2D preview and no errors, dual nozzle
selection*


## Tests

- 20 hours of dual-nozzle printing.
- 100% CTest tests passed
- Validated 208 changed JSON files.

<!--
> A guide for users on how to download the artifacts from this PR.
-->

[How to Download Pull Requests Artifacts for
Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)
Fix #13294
 2026-05-10 02:21:13 +08:00
Ian Bassi
16727644bb Reduce size by Json Fromatting (#13163) 
Reduce the size of current and new JSONs by standardising them with 1 tab indentation instead of 4 spaces.
This effectively reduces the size by almost 20 MB.

| Current | New |
|---|---|
| 85.2 Mib | 67 Mib |

Used [JQ](https://jqlang.org/) `--tab` to automatically format every current JSON.

> [!NOTE]
> Some profiles had the arrays on the same line, but those created by Orca were in the standard format (each object below the previous one). In some cases, this increases the number of tabs due to the new lines, but the increase is negligible, and this way both the base profiles and those created by Orca maintain the same style.
 2026-04-15 22:58:12 +08:00
changyu.chen
96ad19c53f FIX: fixed o1s wiki link redirection 
jira:[STUDIO-15077]

Change-Id: Iebef0043bf1eaf814fa8efa91c2d94e6903cac0e
(cherry picked from commit 6caf8821f8843e698256f7c108a2e310e754f895)
 2025-10-30 14:56:49 +08:00
hemai
967b7a5050 ENH: support nozzle refresh for H2D Pro 
Jira: [STUDIO-13185]
Change-Id: Ib8b5905c32f83b1f849ad4ed327c9d77826d6a18
(cherry picked from commit c603e0f88be71a301ed2fc7f6fff2a34398b6708)
 2025-10-28 15:30:04 +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
zhimin.zeng
213aa92f8d FIX: add auto_pa_cali_thumbnail_image for O1E 
jira: STUDIO-14933
Change-Id: Ib9cf365eca55374ed66e5c51b871542a2004f39f
(cherry picked from commit e167a492a1e784311f118b28acf8b3255d10936f)
 2025-10-28 15:29:59 +08:00
xin.zhang
abefa5ec4d ENH: update text for Fans 
jira: [STUDIO-14707]
Change-Id: I46a8ea876e2fb6f7dc985729bb3aee5a27889743
(cherry picked from commit 4b9a9f6463c7be55c9070b1847f7f545574d0fe5)
 2025-10-28 15:29:54 +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
776b8b63b9 ENH: update resources/printers/N7.json 
jira: [NONE]
Change-Id: Ie1b7bf52800a364e52044b311816a7d5b340e259
(cherry picked from commit 9adef7f956405cdb03c5d98e9400cef371371816)
 2025-10-28 15:29:51 +08:00
milk
299c7c0bac NEW:Add safety button 
jira: [STUDIO-14064]

Change-Id: I6a9be69033ea80c2242561c4e1b0ca5626bc7a51
(cherry picked from commit ac4af3aa1de453330fbf2d58988a6e1ea8d5d445)
 2025-10-28 15:29:50 +08:00
xin.zhang
299b821c5f ENH: support mix mapping 
jira: [STUDIO-13673]
Change-Id: Ic1c89457f5154c108dbab41850ed49561aa34fde
(cherry picked from commit 12942e0545424e2528cc3f3c9aa6947b76469b3d)
 2025-10-28 15:29:50 +08:00
xin.zhang
964a35e9b0 ENH: update filaments_blacklist.json 
jira: [STUDIO-14159]
Change-Id: Idde4d1c366024b49d474d8802d9f912711ea3991
(cherry picked from commit 5bdf315e6f68e2e27036e348e70402df38f4c49f)
 2025-10-28 15:29:50 +08:00
zhimin.zeng
1fa0e600b8 FIX: fix crash when auto cali for o1s 
jira: none
Change-Id: I89b0bd3bc4c0b0c7e17f4f53779a2ec786eff605
(cherry picked from commit 14f041a2527509f779e5345390c0268c5dcaf6eb)
 2025-10-28 15:29:49 +08:00
zhimin.zeng
7fc8992978 ENH: add P2S parameter config files 
jira: none
Change-Id: I619c9a2859759caaeeebf38b54983c093e1d6cad
(cherry picked from commit cc0d9d35d39474015d6ee31de92aa1cf108ffd3b)
 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
84dd0449b7 ENH: support cold pull for TPU 
jira: [STUDIO-13529]
Change-Id: I6a44da3b2774305db179cfed0781d67e9b5a7e2e
(cherry picked from commit 0225c329c8eb8fee332d2cf9732b83ccd0c1dbb3)
 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
2d69a71b15 FIX: update version.txt 
jira: [none]
Change-Id: I34fa021528d6968323edbf2a1e261500e497a77e
(cherry picked from commit ca486329ca809a0c7f65e3e99a5e1b1fedd6c830)
 2025-10-28 15:29:47 +08:00
xin.zhang
2626a6bc3b FIX: check close chamber temperature 
JIRA: [STUDIO-13676]
Change-Id: I5c2712ade24d20d361d00a0b763dd16479aa5fb1
(cherry picked from commit 7ac3c82fbaf0337351d41f5d65c2ae088f755744)
 2025-10-28 15:29:47 +08:00
milk
2aeace7bee ENH:Add Timelapse Of O1S 
jira: [STUDIO-12645]
Change-Id: I87526f9ffddf7e35d07e04e8f3f90df905b26705
(cherry picked from commit 42c573cc8aaf8de02cd8ac5cd22d00001060949e)
 2025-10-03 23:08:53 +08:00
xin.zhang
48b4d51a50 FIX: remove the nozzle offset cali 
jira: [STUDIO-13413]
Change-Id: I802a4b87f4a892d3d333c73f39f95fb035aa2edd
(cherry picked from commit deb30b611272464b2753f6d32bf9a5d11c5f74a9)
 2025-10-03 23:08:53 +08:00
xin.zhang
1c0eecfc1f ENH: update O1S files 
JRIA: [STUDIO-13238]
Change-Id: Ife7e887f4c0dd35df28dc07de54129b3b11fc594
(cherry picked from commit 71014ff0fed255b99d25eb234699e0fdf74ee527)
 2025-10-03 23:08:47 +08:00
xin.zhang
e64fcbe210 ENH: add wiki for replacing nozzle for o1s 
jira: [STUDIO-12864]
Change-Id: I1aec11cea9d82c37a9284f4d3abb849f228a16bf
(cherry picked from commit 27c2d03424314fa10950f89e737827f3c6bb1637)
 2025-10-03 23:08:47 +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
xin.zhang
5d77251a22 NEW: add support for O1S 
jira: [none]
Change-Id: I4f13b1c3980316240c5dde349c25afd20bf3c2b2
(cherry picked from commit d791999b9bb259dda728126272ef0bae37645822)
 2025-10-03 22:32:29 +08:00
xin.zhang
fea37d39b2 NEW: add some filament check for printers 
JIRA: [STUDIO-12604]
Change-Id: Id4c806594eea270decd2e4e3e4941f2bca932712
(cherry picked from commit 8d8391e7465b3d6843613e30bf7f68099ceecfd2)
 2025-10-03 22:32:16 +08:00
milk
604b7d9f70 FIX:chang deteciton to detection 
jira:[none]

Change-Id: I1bfe30add7fce97bd6f448124e212b96a4ea6129
(cherry picked from commit 7623c5a0222188b510b1a76eb2e6b52934e9a0eb)
 2025-10-02 18:11:36 +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
c94c453936 ENH: add notice for PVA in external spool 
jira: [STUDIO-12788]
Change-Id: Ie34da3a3b3ad26edcee7c522ffa4cca059e52f2d
(cherry picked from commit f8527f3bc3cbf137b4925726e24f6f0de4023213)
 2025-10-02 10:00:24 +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
xin.zhang
8f943486a1 ENH: add wiki for replacing nozzle 
jira: [STUDIO-12864]
Change-Id: I3804d3599eb8746902f23b59626fe8c04e949dca
(cherry picked from commit b9428cd32ff8c1c748377cab1e5539fed911177d)
 2025-09-25 17:21:47 +08:00
xin.zhang
a339677d08 NEW: add some filament check supports for printers 
JIRA: [STUDIO-12604]
Change-Id: Ic0e7b517319621907c3c6b8ad82dbcf881c780e8
(cherry picked from commit 55a8c98e9125cdacc801ecebfd82acdcc3e8e7f7)
 2025-09-25 16:38:56 +08:00
xin.zhang
d4fd53763e ENH: update the filaments_blacklist functions 
jira: [STUDIO-11883]
Change-Id: Ib75383f4e75a0bcd566dcf555695f2a9f45f0cba
(cherry picked from commit 6a12adb7f0b83c025ad09e7e59e68d07a0ea8335)
 2025-09-23 21:44:42 +08:00
xin.zhang
e758b77ab7 ENH: add some check job 
jira: [STUDIO-11883]
Change-Id: I9a112b10b18d4c4f4bee5c8076b22f46fb63b13f
(cherry picked from commit 15c7bb729085ec65fee8cc36a5058ac5e883ceb8)
 2025-09-21 16:25:57 +08:00
xin.zhang
5ce62285be FIX: unfinished merge conflict 
jira: [none]
Change-Id: Id97c30a091957c7fe7c96f1818d1073f7993b581
(cherry picked from commit 8ca806abdf5d63bb93c1cf9b3001d961b34f5a44)
 2025-09-21 13:48:02 +08:00
xin.zhang
af9e2cce6f ENH: update temperature limit for all printer 
jira: [STUDIO-11790]
Change-Id: I4980616639ac74417a0243580236232f4baa938c
(cherry picked from commit 4b7610d216570b0b0ec267eccbd6f8cb5f488fa7)
 2025-09-21 13:48:02 +08:00
xin.zhang
285c237095 ENH: remove nozzle setting 
jira: [STUDIO-11598]
Change-Id: Ia10fc3bd67b61a28480b38eef0c28a088c10135e
(cherry picked from commit 9b585239f7137c43cbd766540e93401dbe5e82e4)
 2025-09-21 13:48:01 +08:00
xin.zhang
b18337f0a6 ENH: disable the nozzle settings in Studio 
jira: [STUDIO-11489]
Change-Id: Id26f06d312ea04ba3aaea9ec4539860f72533078
(cherry picked from commit 8fb88001af3cea8c94adb1f1ace00795cb4be299)
 2025-09-21 13:47:57 +08:00
xin.zhang
f4a3ceba2b FIX: add configured bed leveling option 
jira: [STUDIO-11412]
Change-Id: I999d5f4df34c7b1979a340735abaf275f2574674
(cherry picked from commit 63e6890cc742a861c53a109ba848b69292a1a858)
 2025-09-21 13:47:55 +08:00
xin.zhang
1549e8f4e4 FIX: modify style; optimize ext image loading time 
jira: [none]
Change-Id: Ia4bd69cc4ae6ae115c22a5c0b6c6a517773ec3f4
(cherry picked from commit 1dfd5cfdfb44b7ad4418633a3e00f5c451856fe7)
 2025-09-21 13:47:53 +08:00
tao wang
0bd15792e5 ENH:support printing all plate 
jira:[none]

Change-Id: I528129705ad2b6e81cb7d0b625d3a9228baf9cf1
(cherry picked from commit 00f4fbb5a6723ba4977cb18802c65bf8dedf6e29)
 2025-09-21 13:47:51 +08:00
xin.zhang
2806a25f33 FIX: the flow calibration of X1E 
jira: [STUDIO-10784]
Change-Id: I508435efa74a0678ecf5e99f69813b2265bfb32c
(cherry picked from commit 5e93d4c16c1b1dc6333408713bfabda8fe1b9d53)
 2025-09-18 15:22:55 +08:00
xin.zhang
d1d4a68a8f FIX: update the plate check texts 
jira: [STUDIO-10813]
Change-Id: I0304908f7819be1482744e253332bfca1044732e
(cherry picked from commit 3bd7bee74308566e15ae5f9ec4070386b38cc8c1)
 2025-09-18 11:06:02 +08:00
xin.zhang
b6e3ec8852 FIX: update the support of nozzle offset calibration 
jira: [STUDIO-10758]
Change-Id: I34246998b08c54ef8e44172300ab3e1d4e4bf5c4
(cherry picked from commit f2f6b290230b11e984d7e729b56bbe1c666879c8)
 2025-09-18 10:56:21 +08:00
zhimin.zeng
1cbb0f817d 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
xin.zhang
b0943a2d0b FIX: update the flow calibration options 
jira: [STUDIO-10784]
Change-Id: I75c5319daf01da52ae521632d71d32813bcbb32f
(cherry picked from commit 57245bd45620cffdcfce8ef623d79b284d60b3eb)
 2025-09-18 10:18:35 +08:00
tao wang
35bb239a8f 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
tao wang
1241b66dfc 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
xin.zhang
0099823501 FIX: support save remote file to storage 
jira: [STUDIO-9095]
Change-Id: I675d942b52e723908a5be1861efe7917cdcc599d
(cherry picked from commit 5850bc8fbd0dd6e757e48e54275c1788e15ff93e)
 2025-09-17 16:10:44 +08:00