juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-15 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,291 Commits 67 Branches 82 Tags
bc02e48dc09d35cf05e77cf89ea72a89fb0b3090
Commit Graph
2448 Commits
Author SHA1 Message Date
xun.zhang bc02e48dc0 FIX: display the minimum flush data 
1. Use the minimum flush between nozzle volume and flush in datalist
2. Add a new param to decide the datalist to use

github:7445

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id87c98ca5069e7b328974d641d7a81dfbf9c50a0
(cherry picked from commit 2be29b784727330732170b5c2ff0ba9d5e79d82f)
 2025-09-29 20:38:38 +08:00
zhimin.zeng c945bfa36c FIX: slice error abort Label object id error 
jira: STUDIO-13010
Change-Id: Ia1bc287e2d57201e2d28469685490397f5a213b7
(cherry picked from commit 488929eb0850bf6adc300ac133b1cdd7d7b52af7)
 2025-09-28 17:30:11 +08:00
xun.zhang a092c48642 FIX: find the first layer with enough space to extrude 
1. Sometimes the first layer is too small and does not have enough space to extrude.That will make first layer extruders empty

jira: STUDIO-13030

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I69b99ab74101c772f4c91e955060e403988bb91c
(cherry picked from commit 9699397858c6d52d027e79e91041a9dac7280bba)
 2025-09-28 17:11:05 +08:00
chunmao.guo 013d2d8d6e FIX: filament variant index & override nil value 
Change-Id: I828fff09df39a60d59af516c969466d9b09e503f
Jira: none
(cherry picked from commit 1745657e222b8e9d7c96fcca16581b2deac526c6)
 2025-09-28 16:46:34 +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 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
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
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
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
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
zhimin.zeng 0431ae4e17 FIX: update edited preset when delete filament 
jira: STUDIO-12198
Change-Id: Ie1eedf1a8b0acda8fb4292eb970f4aa416fa9181
(cherry picked from commit 9c8530946d888030061cc87b8a35c24ed583506e)
 2025-09-25 17:21:54 +08:00
jiaxi.chen 68d7bd9e17 FIX: Interface_not_for_body is ignored for detached support layers 
jira: STUDIO-12826
Change-Id: I3ab585aa899dee5cf006effb3cea15b5e64332eb
(cherry picked from commit 56e239e38103a0f1631f0174c9153e239ab5c802)
 2025-09-25 17:12:35 +08:00
xun.zhang ec295405c1 ENH: do not insert m191 if machine start gcode already has 
jira:7054

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I10edb3b9cf9f1120dbb1572fa84c7719d57b58f7
(cherry picked from commit 285d83407730b6f9ff4df916fd12db41a2969e15)
(cherry picked from commit 080b9026aea3f616db635554cee0afa661c01ac9)
 2025-09-25 17:09:10 +08:00
xun.zhang b636bbaf2f ENH: add max print z in placeholder 
jira: none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I55caf23b11cc0194f9c155364e6bb02e298f9392
(cherry picked from commit 724c9b0eb5e73517c921ea809bb7f7e82325130b)
 2025-09-25 17:02:21 +08:00
xun.zhang d6a8f881de FIX: add a new way to calc params size 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I75a983a8c2ec1d9e4b691e32e8beead0868d2644
(cherry picked from commit 55162b1f7d4f9e0abc3de961fda5085b66f73b2f)
(cherry picked from commit c86da564e0cd4155b155b84debd7f0f0da1b20d4)
 2025-09-25 17:00:45 +08:00
xun.zhang b351fa3b50 FIX: only meature m29 once in machine start GCode 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3661159dd09f6d179eae3a0b1f2bbc14277be312
(cherry picked from commit 60492b7b0b57dc243cc8ac17f2cad638724aaca2)
(cherry picked from commit 8555af21cacaa10e74715e771aa0866052a31bd6)
 2025-09-25 16:49:01 +08:00
jiangkai.zhao fd17dd6382 FIX:Crash caused by wipe_tower depth = 0 
and remove useless assert

jira: STUDIO-12514,STUDIO-12474,github#7064
Change-Id: I8faf498251c8f7ca2c1eead463f38e8a3d836299
(cherry picked from commit 723e2d7ced6b466f2166085b8ca007762aaf17aa)
 2025-09-25 14:45:44 +08:00
zhou.xu 2ba649d7ef FIX:add bottom texture 
jira: STUDIO-11342
Change-Id: I69fd573b4d7b05135d5f280cf42d367421664cff
(cherry picked from commit 645f93fac732b8794aa1e99301bfe179a74915a7)
(cherry picked from commit 803a1dffde0f66c3076ae4fc80d4b821f34b03fc)
 2025-09-25 14:42:57 +08:00
Noisyfox 8653f034e9 Fix crash due to profile variant difference 2025-09-25 09:41:54 +08:00
Bastien Nocera c9a2cb7753 FIX: Fix missing diff/intersection/etc. declaration 
/run/build/BambuStudio/src/libslic3r/PrintApply.cpp:313:28: error: ‘diff’ was not declared in this scope
  313 |             Polygons res = diff(printable_poly, poly);
      |                            ^~~~
/run/build/BambuStudio/src/libslic3r/PrintApply.cpp:317:39: error: ‘intersection’ was not declared in this scope; did you mean ‘Slic3r::line_alg::intersection’?
  317 |         Polygons all_extruder_polys = intersection({printable_poly}, extruder_polys);
      |                                       ^~~~~~~~~~~~
      |                                       Slic3r::line_alg::intersection
In file included from /run/build/BambuStudio/src/libslic3r/Polygon.hpp:7,
                 from /run/build/BambuStudio/src/libslic3r/BoundingBox.hpp:7,
                 from /run/build/BambuStudio/src/libslic3r/Geometry.hpp:5,
                 from /run/build/BambuStudio/src/libslic3r/Model.hpp:6:
/run/build/BambuStudio/src/libslic3r/Line.hpp:123:24: note: ‘Slic3r::line_alg::intersection’ declared here
  123 | template<class L> bool intersection(const L &l1, const L &l2, Vec<Dim<L>, Scalar<L>> *intersection_pt)
      |                        ^~~~~~~~~~~~
/run/build/BambuStudio/src/libslic3r/PrintApply.cpp: In lambda function:
/run/build/BambuStudio/src/libslic3r/PrintApply.cpp:323:22: error: ‘intersection’ is not captured
  323 |                 if (!intersection(poly, contours[i]).empty()) { result.insert(static_cast<int>(i)); }
      |                      ^~~~~~~~~~~~

(cherry picked from commit 00f4bbef9bcab1d7bb15ccfaf7bb4d3208b4bd12)
 2025-09-25 09:16:45 +08:00
xun.zhang e1626c26b1 FIX: add protection when sync presets from other printers 
jira:STUDIO-12575

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I5a22129fe12a3600dcc4e3f387374122e349e38c
(cherry picked from commit 21863f925db1eeb1db79ba5859840aa23f852180)
 2025-09-25 09:03:58 +08:00
zhimin.zeng 4a02669054 FIX: cannot slice when print by object with one multi-color object 
jira: STUDIO-12518
Change-Id: Ia54f979c69aa19aaa44bf1cb1d83ec973f6eb8f3
(cherry picked from commit 6c48ded6b54bd20cb55ae6e4c2c155dc25473ed7)
 2025-09-25 09:03:32 +08:00
xun.zhang 3c051f4180 FIX: invalid params in user preset load 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e9cdabb2d9c285db841c810f32aee5943b4db82
(cherry picked from commit ff8d764e7256cec1e7cd1d4d3d034590eb846f45)
(cherry picked from commit fb0461f3459afcfc80165442277ba8c54e232a39)
 2025-09-24 14:37:18 +08:00
lane.wei 8c64808ae5 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-09-24 14:33:37 +08:00
lane.wei d691e2c2ed ENH: config: add some miss codes 
previous commit 'ENH: config: add nill load/save logic for user config' jira: no-jira

Change-Id: I91ab326e533d54846518d11b457db0b0afe4d499
(cherry picked from commit 4086ec60c2b14bfb8ab12aa97842d563f71739ab)
 2025-09-24 14:23:52 +08:00
lane.wei ae72d3345f ENH: config: add nill load/save logic for user config 
Change-Id: I8da6c5b345cc088862f2c720aeb742b9617ff3e7
(cherry picked from commit 603f93d97f0ad70e01e120854887142ab05ee089)
 2025-09-24 14:17:53 +08:00
xun.zhang e42556f835 FIX: collision caused by pick safe pos in object mode 
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic9a45e314ffa1115854736516cc06dfd976c28f9
(cherry picked from commit 04d90ac16d3abc481860a46b2d8bc8cd2f599aed)
 2025-09-24 13:12:55 +08:00
zhou.xu adeb3ab3f7 FIX:Fix the issue of importing GCode array out of bounds 
jira: STUDIO-12389
Change-Id: Id7995558bf0e297e2360b338ffbf63d93efa38f0
(cherry picked from commit 6d15a9005769a7dbfb96bb28ce6b57e55bf1c435)
 2025-09-24 11:18:23 +08:00
zhimin.zeng fa8280f065 FIX: The print_z of some layers is incorrect after slicing 
jira: STUDIO-11989
Change-Id: Ia0488d8270a7880d3f019d757cde7ce2f591713d
(cherry picked from commit 9bd47ef3e59b5518cd049182890c1d557c69b710)
 2025-09-24 10:40:45 +08:00
xun.zhang a6084d01bd ENH: add placeholder to check whether filaments is BBL 
1.Also add some side texts

jira: STUDIO-12308,STUDIO-12309

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I16f21d001cf0c87620a8d7c93b33af4f63981624
(cherry picked from commit 31451dcd3310720692ec2748962f379ac3c50cf4)
 2025-09-24 10:40:45 +08:00
Noisyfox 580414265d Merge remote-tracking branch 'upstream/main' into dev/h2d-2 
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
 2025-09-24 09:15:33 +08:00
xun.zhang d9b68c6eef ENH: support curr extruder in timelapse gcode 
jira: STUDIO-12119

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If8fd91a6a1d54d3c5f4430c7f5c06685792c3a8e
(cherry picked from commit faacd23e3fba22b290e6fd47bce9de704c1165a1)
 2025-09-23 21:39:51 +08:00
xun.zhang 1e9d825dbb ENH: remove the limit for number of tpu filaments 
jira:STUDIO-11995

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd3ff7bf870570f9691b7008d8ca6ee8245c046d
(cherry picked from commit cd3219e6654d126363c04d0135bece62dcf94e39)
 2025-09-23 21:32:18 +08:00
zhimin.zeng 8f97d9bbc3 ENH: Optimizing the shape invalid condition for wipe tower of multi-extruder 
jira: none
Change-Id: Ic80a83088f409f0c4d4444c085befb6a1817c85b
(cherry picked from commit e22d328fa9d1682c00617a4cad0498c67a7512f4)
 2025-09-23 17:30:36 +08:00
xun.zhang 44e62213e9 FIX: potential collsion in by object seq 
1. update the expand length
2. enhance rod collision detect

jira:STUDIO-12199

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1350ef5612b833405928e22c542a7a6f0c671105
(cherry picked from commit 7a197af3e0aa6d6c1493768d757ecdc938e49c1d)
 2025-09-23 17:22:10 +08:00
xun.zhang 5e8272b0cb FIX: support flush params in machine start GCode 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7566b960421b088f1d122936d9bc3974057a1e6b
(cherry picked from commit dd796026b3f869cfc40e8d9c5769c2a40e565441)
 2025-09-23 17:12:51 +08:00
xun.zhang 7bd4f85a96 ENH: add params for filament retract when extruder change 
jira: STUDIO-11965

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id175e9dbce419d43cf45d6116ed4fa4fd556f606
(cherry picked from commit c7964441719f521d1a20dc9f084a7598bd01a9a5)
 2025-09-23 16:38:50 +08:00
xun.zhang cdf66984dd ENH: add flush params for multi filament 
jira: STUDIO-11965

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2245f22a03c65b570bc60a2792daf4c1683f1ebd
(cherry picked from commit ffe2653341bffd5aee42436e236d45e0b87b56aa)
 2025-09-23 14:16:03 +08:00
xun.zhang 3064da3ed7 ENH: do not reslice if only notes changes 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibcb33b981af691c1521041251df9e1c158d26e0c
(cherry picked from commit 43531ed01e7dfa28a649227471cf283a33b38959)
 2025-09-23 08:58:51 +08:00
xun.zhang ce81f03b6d FIX: avoid collsion in by object mode 
jira:STUDIO-11625

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If5957a919af606934a34aa942f54dc4e7650a7f9
(cherry picked from commit 476c17819fe2e4fb7891b4b46865dde1a0057f33)
 2025-09-23 08:55:31 +08:00
SoftFever b483dff617 Enhance GCode handling for Z-axis movements (#10803) 
* Enhance GCode handling for Z-axis movements

- Updated `travel_to_z` method to include a `force` parameter, allowing forced Z movements.
- Modified GCode generation logic to ensure Z position is restored after unknown last positions.
- Enforce z restoreation after tool changer

* Improve filament_multitool_ramming logic

* fix indent
 2025-09-21 22:03:54 +08:00
xun.zhang 3e8ca38990 ENH: refine filament sorting when flush volume is 0 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia012cbd7a45a2fead94d2c579106115ea8edb5e8
(cherry picked from commit 6c1be5bddca79bc9a3bf536277d46cfc7fe20ebe)
 2025-09-21 18:01:16 +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
chunmao.guo d31c4427aa ENH: printer nozzle diameter select 
Change-Id: Ibf8b74e1f93a7c387db3f0fb5e6e733165322322
Jira: STUDIO-9140
(cherry picked from commit c990314567383d3bfff72ac11df6471e0a10f315)
 2025-09-21 14:37:37 +08:00
zhimin.zeng 119f16c565 ENH: add filament_printable and delete unprintable and printable list 
jira: none

Change-Id: I643ab11831ceac1fe0793510f64b288cbd16415a
(cherry picked from commit 3dd5a601547485bfcc4188727343a52c30bb6a73)
 2025-09-21 13:48:08 +08:00
zhimin.zeng 0926dc46fb ENH: add printable filament types for extruder 
jira: none

Change-Id: Ie6ada223bc11a53b975c8c20b4a41e7cdc2d524c
(cherry picked from commit c64270f506a4d004f66aef3ff31760f793eca489)
 2025-09-21 13:48:07 +08:00