juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 17:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,820 Commits 17 Branches 77 Tags
c2c796ef25cdcfbfdb51ecf8bfbaf8a6bc4e2f7d
Commit Graph

16417 Commits

Author SHA1 Message Date
milk
4deb47554a FIX:Modify the calibration interface display issue 
jira:[STUDIO-12708]

Change-Id: Ifd10db6df9f7ad3263d33817ec8f4c23abc16bab
(cherry picked from commit 25741d8baefb44e643eeb184e3922650a288def0)
 2025-09-28 15:02:29 +08:00
milk
78734352d8 FIX:Optimize the pop-up promote for turning off the lights 
jira:[STUDIO-12654]

Change-Id: I5a1e2056f530b8c73ef93031308facfe966e3e62
(cherry picked from commit 735e8a3259544bf2d8ac02a7ac6ca271d4506da1)
 2025-09-28 15:02:25 +08:00
milk
bdf1caffd4 FIX:change filename from 3mf to gcode.3mf 
jira:[STUDIO-12827]

Change-Id: I0070f1e450b8b9d09507062c62efc75f1f361e6d
(cherry picked from commit d4a9ad1fdc57c93f3a51354908c29258f8c665fd)
 2025-09-28 15:02:10 +08:00
fei2.fang
ea826815af FIX: Show RGB for custom color and allow staying in official picker dialog 
- Display RGB values when a custom color is selected
- Prevent official color picker dialog from closing when custom color dialog is canceled
- Ensure multi-color materials are correctly displayed when importing new 3MF files

jira: STUDIO-12938, STUDIO-12937, STUDIO-12933, STUDIO-13110

Change-Id: Iab410585bf8cc5e9e81c6f0da23fe4ddba561785
(cherry picked from commit 2c20d591b998b02b0b66ac81b048a28fa26bd409)
 2025-09-28 15:01:11 +08:00
xin.zhang
0bbd563a79 ENH: Add label if the button can not be used 
jira: [STUDIO-12929]
Change-Id: Ia4026282a44fd1a83a4292d7a7d11d43ed035db6
(cherry picked from commit e65755a474bc36bee0f22b7a6fb9c7eb5f86be65)
 2025-09-28 15:00:22 +08:00
xin.zhang
d4115e0837 ENH: use the en style for PrintOptionItem 
jira: [STUDIO-13009]
Change-Id: Ie05b683adf28b2ade4f7333678b086e328d7e525
(cherry picked from commit 360c92dfac7a77e14537e8c226eed193f14ea27c)
 2025-09-28 14:59:18 +08:00
xin.zhang
025294894a FIX: skip the color codes with undefined color syntax 
jira: [STUDIO-13037]
Change-Id: Ic733a2b67df49556c16f4392ecf61d95471e9aa8
(cherry picked from commit 6658f522166e432b383669903a0b30ee15cf6cdc)
 2025-09-28 14:59:12 +08:00
fei2.fang
e3cb884ee8 FIX: Correct the label alignment problem on MacOS 
- Adjust the color of the dividing line to be darker in dark mode.

jira: STUDIO-12982, STUDIO-12935

Change-Id: Icda8dd10dbcc470e55c8760716f5545fb784f194
(cherry picked from commit 60aa221033134dfba19830f71cd307db91119ed6)
 2025-09-28 14:59:03 +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
xin.zhang
2be0569e3d ENH: update filament color file; the color name may be empty; using set instead of unordered_set 
jira: [STUDIO-12346]
Change-Id: If83835fea7108babd2b19c26394ad0429493f394
(cherry picked from commit 85b07c170cd0e30f75dfab8ef68b02b0468c9f92)
 2025-09-28 14:57:36 +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
jun.zhang
9e990fc5c1 NEW: export toolpath to obj 
jira: STUDIO-12105

Change-Id: I4cd110a5b63996b5dc81cb307ac6d257a817bc51
(cherry picked from commit 67f018c0eebbd467ac76e35576a5c8c9412bb67f)
(cherry picked from commit 09c9493fc44cf1da417ab2fd836d97d1501a2550)
 2025-09-28 14:56:55 +08:00
SoftFever
614f93053a Revert "Set NSWindow color space to sRGB on macOS" (#10892) 
Revert "Set NSWindow color space to sRGB on macOS (#10827)"

This reverts commit 32ca697e9e.
 2025-09-28 14:32:15 +08:00
zhimin.zeng
885e905e76 FIX: fix some calib dialog bug 
jira: STUDIO-12984 & STUDIO-12979 & STUDIO-12978
Change-Id: I29fadd20b29c76a288755122dd027820fed9252e
(cherry picked from commit 1739177f3cd10b81fd1924059f6da9ba4778ba5a)
 2025-09-28 14:22:46 +08:00
fei2.fang
27943f7047 FIX: Correct virtual tray loading and multi-color material display 
- Fixed incorrect is_array() check on vtray["cols"], causing virtual tray init failure.
- Rewrote AMS grouping logic using iterators and set<int> for cleaner and safer traversal.

jira: STUDIO-12955

Change-Id: I09a68e259b56864260abb6c59ff9b1bf7ec2823c
(cherry picked from commit 60c47473047a3fba20d59cd974179537c116524d)
 2025-09-28 14:19:10 +08:00
fei2.fang
470ed6af5d FIX: Support dark mode in filament picker 
- Applied dark theme styling to filament picker dialog
- Fixed color picker background not updating on theme switch

jira: STUDIO-12935

Change-Id: I9c7dcc518e7b0bd2c330f477ee42f4c61ea9fd4b
(cherry picked from commit 66ae7a02b945ff603b2dc699c93e55589481379e)
 2025-09-28 14:19:02 +08:00
fei2.fang
9ee76e4775 NEW: Official filament color selection approved 
- Add a filament picker dialog for official color selection
- Enable displaying multiple filament colors in the picker dialog and preview sidebar
- Introduce two new config options:
  - `filament_multi_colors`
  - `filament_color_types`
  to both the application config and the 3MF config

jira: STUDIO-12346

Change-Id: I66f8c1ec9147df4f5948c8a329c1737551280e63
(cherry picked from commit 522dc0bbca49033a1ba9725ca7f6c3ea729691a6)
 2025-09-28 14:17:52 +08:00
xun.zhang
5a1dc90e8c ENH: add prompt for incompatible filaments and nozzles 
jira: STUDIO-12873

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ieb79a35e0609e7687fdcf31742df3a08fedc925b
(cherry picked from commit 1ef32833035629c1b3644d77fdc9c234992090f3)
 2025-09-28 14:03:52 +08:00
Andrew Sun
32ca697e9e Set NSWindow color space to sRGB on macOS (#10827) 2025-09-28 13:59:47 +08:00
zhou.xu
94732b6bad ENH: 3mf: fix save fullpath issue 
jira: STUDIO-12970
Change-Id: I71bbd9fd3e1bae669fcc29822f75a3ab9025af56
(cherry picked from commit da0f893433049899227a71e5ddc79833431ce39a)
 2025-09-28 13:12:11 +08:00
xin.zhang
1635ce28d6 FIX: the sort function of FilamentColor 
jira: [STUDIO-12965]
Change-Id: Iadd8342f3b67877e8b41c28d87f5150528f340a9
(cherry picked from commit b56ca2f5f619bbafd5473416ab9bf599d2a05e7e)
 2025-09-28 13:08:09 +08:00
lane.wei
bb08bb0e6d ENH: presets: add logic to process filament preset splits 
jira: STUDIO-12952
Change-Id: I232434fb4b1d53a7379be2f745457a83bf923677
(cherry picked from commit b9f584281ae801a3ee542c1ebd81c6cb7dd35cde)
(cherry picked from commit 9b1f5496aef411218d538a07386fccb2a085435b)
 2025-09-28 13:07:55 +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
milk
3a3f6d3a43 FIX:Disable when the AMS slot is empty 
jira:[STUDIO-12764]

Change-Id: I9baea63965159f9416d91e6dea40962ec292b9e2
(cherry picked from commit 5aff60e9840343e5465833259cca2d8658a8fce7)
 2025-09-28 11:39:24 +08:00
lane.wei
18b9bffd02 ENH: 3mf: fix save fullpath issue 
jira: no-jira
Change-Id: I3077cceae2dfadc2882b4eb1de2234c5c445f342
(cherry picked from commit 5776d8e3fc4f8578b9ed397bd0afe0f9668cd634)
 2025-09-28 11:38:31 +08:00
xin.zhang
4f8f642655 ENH: suite to DPI change for score panel 
jira: [STUDIO-12923]
Change-Id: I22bb0d8ebd13d23f46bd785d3a4848669185175d
(cherry picked from commit 187040d70c9416f5f3ca9dbe74f1d1d09cb23218)
 2025-09-28 11:38:17 +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
c415eea556 FIX: use data to check the fan control 
jira: [STUDIO-12917]
Change-Id: I74f816a21beb2dfb4191bb73298882efd22a6191
(cherry picked from commit 4f0f4fc64802d777d11105d433e59f57168bfd66)
 2025-09-28 11:35:57 +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
xin.zhang
95027d72db FIX: DPI scale for TempInput 
jira: [STUDIO-12907]
Change-Id: I7d9751856cb69babb7093973136bdfd9fad4f501
(cherry picked from commit 03adbd4becf1106d02ac4c8251bc3dbfe84c517d)
 2025-09-28 11:35:44 +08:00
Noisyfox
03e056e278 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
Noisyfox
82079ea16c Allow negative vector index 2025-09-28 11:07:28 +08:00
Noisyfox
81978dc558 Allow referencing a vector without explicitly specify the extruder id 2025-09-28 10:51:40 +08:00
SoftFever
f020480900 Revamp OrcaSlicer updater (#10884) 
* Revamp OrcaSlicer updater
 2025-09-28 10:33:33 +08:00
Noisyfox
042cf84614 Update color 2025-09-26 23:00:03 +08:00
Kunlong Ma
5a6cbc0a9a NEW: support send to sd card with cloud 
JIRA: STUDIO-7378

Change-Id: I95fee50db29825e508d276d52c7a3e85e1347ebd
(cherry picked from commit 13db95ceb4f18b8cbce1e67447eeaa6ee36cc8ad)
 2025-09-26 22:29:12 +08:00
Noisyfox
dc494da0b3 Move earcut to deps_src 2025-09-26 17:16:20 +08:00
Noisyfox
2c6bb1a443 Update layout 2025-09-26 15:21:23 +08:00
Bastien Nocera
2048f57cda FIX: Fix missing std::map declaration 
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp: In lambda function:
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp:55:14: error: ‘map’ is not a member of ‘std’
   55 |         std::map<cv::Vec3b, int, std::function<bool(const cv::Vec3b &, const cv::Vec3b &)>> colorCount(
      |              ^~~
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp:13:1: note: ‘std::map’ is defined in header ‘<map>’; this is probably fixable by adding ‘#include <map>’
   12 | #include <filesystem>
  +++ |+#include <map>
   13 |

(cherry picked from commit b9402b5be60188e8867471b64c3bc1d8c1d6bfa7)
 2025-09-26 14:38:45 +08:00
Bastien Nocera
13d92131e7 FIX: Fix missing BOOST_LOG_TRIVIAL() declaration 
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp: In member function ‘void Slic3r::GUI::_BBS_3MF_Base::log_errors()’:
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp:598:47: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
  598 |     for (const std::string &error : m_errors) BOOST_LOG_TRIVIAL(error) << error;
      |                                               ^~~~~~~~~~~~~~~~~

(cherry picked from commit dba7f3ad07f530ddce3e75eaf8f357794cfd1935)
 2025-09-26 14:38:38 +08:00
Bastien Nocera
22c42323a4 FIX: Fix missing boost::lexical_cast declaration 
/run/build/BambuStudio/src/slic3r/GUI/PartSkipDialog.cpp: In lambda function:
/run/build/BambuStudio/src/slic3r/GUI/PartSkipDialog.cpp:495: error: ‘lexical_cast’ is not a member of ‘boost’
  495 |                     url += "&refresh_url=" + boost::lexical_cast<std::string>(&refresh_agora_url);

(cherry picked from commit fc8537c038a8dcc419f8b5558feb71700b77c996)
 2025-09-26 14:38:31 +08:00
hemai
b4c08f9bdf ENH: disable skip when objects number>64 or model is not support 
Jira: [TUDIO-13411]

Change-Id: I93617965e69ba72a1cc34dd0981b8fd92eb58d3a
(cherry picked from commit 417109e5f02613bd18eae125705effa7ae61cfda)
 2025-09-26 14:35:06 +08:00
hemai
6148c73ffc FIX: scroll view can't slide && cnt_label display incomplete 
Jira: [STUDIO-13176]
Change-Id: I32dfc793a431412a7df02ae2b9d952d175d97deb
(cherry picked from commit bdda60dd1dc37a4750cdb7b426de9e9518c581ea)
 2025-09-26 14:34:35 +08:00
haolin.tian
219300277c FIX: adjust ortho, do not scale source image 
jira: [STUDIO-12333]

Change-Id: I4fabccc9c489ed7fa4a8ad1239ed26c1710b3ee9
(cherry picked from commit 3fbb9946d1deee1855498e97cc66844e1f2e54aa)
 2025-09-26 14:32:29 +08:00
hemai
b49ca90940 FIX: printer file system network reconnect bug && invalid obj bug 
Jira: [STUDIO-13295]
Change-Id: I3b0c907ab4357d09ad592a0d937d83aaa15e8680
(cherry picked from commit 928d6b4c6a8c3ea8c9bd179c51afdb7dc55f45ce)
 2025-09-26 14:31:47 +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
hemai
7d147cc550 FIX: parts file download failed && canvas display error 
Jira: [STUDIO-13253]
Change-Id: I6ce11c0ceb1c4f7ed49c41eb9c6d7a6d96e866f9
(cherry picked from commit 37f742007bc168d8a3365ca617c7bd27bafca038)
 2025-09-26 14:30:07 +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
5bc21568cf ENH: advance part skip dialog 
Jira: [STUDIO-12687]

Change-Id: Ie6805c57f478ae5a10f81b49dc5a4e45fb40dbc7
(cherry picked from commit 8ed17efc32f8c635dc50e27bf7146fd2eb70941d)
 2025-09-26 14:25:55 +08:00