viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 6 Packages Projects Releases 5 Wiki Activity
26,970 Commits 6 Branches 5 Tags
4ef27847cd421bebbba12d7aa7bdccbe8ffa443c
Commit Graph

2392 Commits

Author SHA1 Message Date
jiangkai.zhao
8e616ce892 ENH:add flat_irong as print preset 
jira: none
Change-Id: Ic29634780e1ece2d0cffddd0c2cf7cafb1318fa2
(cherry picked from commit 2acd313f72d5e9531cf1394c218dc3bc6b8d9521)
 2025-09-21 13:48:03 +08:00
Noisyfox
2cea19bdcd Fix build error caused by cyclic include 2025-09-21 13:48:03 +08:00
xun.zhang
b5756d1702 ENH: add timelapse pos picker 
1. refine code structure
2. prevent moving tool head between camera and object
3. consider raft layer

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic0004791bfd4036d4323045a041709d861e5c8d0
(cherry picked from commit 7dc269f99473421162ad89c555bfac7ace0e9a6b)
 2025-09-21 13:48:03 +08:00
xun.zhang
01673d1fef ENH: add filament map and filament list in GCode head 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id214bcf5f76e6c59d4b8bcb55583f96b347630bf
(cherry picked from commit d1e6680f4c19ae19e8328813528f21e63084e577)
 2025-09-21 13:48:02 +08:00
xin.zhang
472a48acc6 ENH: add nozzle type ntTungstenCarbide 
jira: [STUDIO-11597]
Change-Id: Ibec41549042d253aeb85ba81e93e7c26a4a56ed2
(cherry picked from commit 1352cff31427eadd2c85ce4c9602ab3379a5ae9e)
 2025-09-21 13:48:01 +08:00
zhimin.zeng
e993a4cab8 FIX:Incorrect filament used for extruder with support filament 
jira: STUDIO-11670
Change-Id: I7c5da8280cdc31c5910cd42333654db7673265c7
(cherry picked from commit 5b0b04815e6cff0d119328e780e4183a6ed479c5)
(cherry picked from commit 4364a4ecca47c96ebb39a4a7eacefb50ef6dd932)
 2025-09-21 13:48:00 +08:00
xun.zhang
fa05f107ab ENH: refine check logic for filament mix printing 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I199462cee6284e13e58f829b7972dd3124bfc385
(cherry picked from commit 22834b23586d2230e94e9dffd8b09146e5342246)
 2025-09-21 13:47:58 +08:00
xun.zhang
86f16d9c8b ENH: add some missing filament types 
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6d5b8f7a3c2eb26950bf39694023903ddbc47088
(cherry picked from commit 14eb79ab9a02d73f5e6deea8f7dc77897e76ac7e)
 2025-09-21 13:47:58 +08:00
chunmao.guo
b64d05608b FIX: not transfer filament param copy variants 
Change-Id: I2fea8a692506ce8c1def6ec4700c788fa31cf7be
Jira: none
(cherry picked from commit ad049d1a90b9bbd7b8c9d4cb9d32f013d6ad3de9)
 2025-09-21 13:47:57 +08:00
zhou.xu
59e211a4e1 FIX:add exist_multi_color_filment logic 
jira: STUDIO-11477
Change-Id: If30e0289096b6d465eace503fbe706fb31742f0c
(cherry picked from commit 1ace58b950de660bf7eac64bab77b0091d95a0c0)
 2025-09-21 13:47:57 +08:00
xun.zhang
69be743c68 FIX: incorrect flush volume after sync ams 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I44d031b1fdcc02adbfc4346314f5001c56a941b8
(cherry picked from commit e854174bc0d2f9965f11da9860f67ce5996e99b0)
 2025-09-21 13:47:57 +08:00
jiangkai.zhao
91ee2cdbc2 ENH: update param's mode and tips 
jira: none
Change-Id: Ifb266f47e849f431ca92104249a5328d26734808
(cherry picked from commit 96516e8c042692ded35443bb40ae86f48e1264ae)
 2025-09-21 13:47:56 +08:00
xin.zhang
377df07c67 FIX: default cal_idx is -1 
jira: [STUDIO-11448]
Change-Id: I6f37bc7d095a1d25f4f52db9d34954d2dccf1576
(cherry picked from commit b9cb321f733656e91936ced34930b1df10f477b0)
 2025-09-21 13:47:56 +08:00
chunmao.guo
d2754f4c36 FIX: sync_ams_list find filament_type 
Change-Id: If6d95c26fa128377d8b4414470b07ed5a40f0b09
Github: 6152
(cherry picked from commit f076d95d8847d80ed466d118d718ec7584293e97)
 2025-09-21 13:47:53 +08:00
Mack
5004fbbf60 ENH:loading the step in boost thread 
github: #6079
Change-Id: I0a289fc9730e7d091a71137cf11a711dfee5392f
(cherry picked from commit b454e7d8bb91b62b3be6121c567f7aee291eff50)
(cherry picked from commit b7ffba39e407317ad3cc4fe65d220f0049963aa9)
 2025-09-21 13:47:52 +08:00
zhou.xu
8b2d727edd 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
Mack
ee169528c5 Fix:Retain the brim ears during model merging 
jira: STUDIO-10122
Change-Id: Iae35e4137f64a6d697b90bf76f0e6fbc4d8025c4
(cherry picked from commit cf5a2c9046490a1f34346713947b0e016f127b07)
 2025-09-21 13:47:51 +08:00
jiangkai.zhao
f3c11288f6 Fix:skip_point error when gap overlap 
jira: STUDIO-10852
Change-Id: Idbfdfe2513115b0fef540e0d681997be0a3719a4
(cherry picked from commit baae89db17b7a59858d7760d6bfc394fbdd8c252)
 2025-09-21 13:47:51 +08:00
jiangkai.zhao
e7f95ae1af Fix:False positive in collision detection 
jira: none
Change-Id: I4f2c88ac95273086e2f77e60f5856415aba83741
(cherry picked from commit 93e8f29e5d683e2949310b3037b1d90f3eeeab0b)
 2025-09-21 13:47:51 +08:00
zhou.xu
4b7f245740 FIX:fix obj import crash 
jira: github 6333
Change-Id: I3df9edce95b24751f39bcdcbe75e7050fede68a1
(cherry picked from commit 46678882ed2630f3e4593fa4176cec64e8e5ed13)
(cherry picked from commit cb5ac14fd3f111d522696d418d1c175dce88904c)
 2025-09-21 13:47:51 +08:00
xin.zhang
38a71f527e ENH: move some level 
jira: [none]
Change-Id: Ibd0d380b16b30f63144d38a0c34972d8b7c4153f
(cherry picked from commit 2da69efd9b0db6c2be6a1b3985bbafb7afc5d3be)
 2025-09-21 13:47:50 +08:00
lane.wei
833108d29a FIX: 3mf: fix a popup issue while parsing old 3mf 
jira: no-jira
Change-Id: I89f0b83f146bea60ef821160254cee4d2c0eb0ca
(cherry picked from commit 5f1714f02ceeb34519e0ec401d37be3ff7efa87b)
 2025-09-21 13:47:50 +08:00
lane.wei
c2fea83e72 ENH: CLI: add allow_mix_temp option 
jira: no-jira
Change-Id: Idff6ff2f11b4b0a1fb3a4a410fa46c78d38d1a6e
(cherry picked from commit 4ffa7b505a4c1b1f27152c5f5198c9571939de40)
 2025-09-20 15:37:12 +08:00
xun.zhang
782c7f1d0c FIX: filament savings not consider flush multiplier 
github:6214

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9cb9f8d172bfa501732bb50f437e261793e18972
(cherry picked from commit 274a05367313daac913e58b98dd8944e934ebabe)
 2025-09-20 15:36:49 +08:00
Noisyfox
c26266dfb6 Merge remote-tracking branch 'remote/main' into dev/h2d 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/slic3r/CMakeLists.txt
 2025-09-20 13:10:10 +08:00
Dipl.-Ing. Raoul Rubien, BSc
c228ab2da1 Fixes 999 CMake Warnings (#10729) 
* fixes: 999 CMake Warnings at src/dev-utils/CMakeLists.txt:39 (add_custom_command)

* cmake clenup: adds PUBLIC/PRIVATE to libslic3r; attempt to reduce warnigns from eigen
 2025-09-19 23:52:41 +08:00
Dipl.-Ing. Raoul Rubien, BSc
75ed995b00 Fixes 50 Compiler Warnings: Add SYSTEM toCMakeLists.txt (#10653) 
* src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* src/*/CMakeLists.txt: removes duplicate sources from lisbslic3r_sources and SLIC3R_GUI_SOURCES"

* .gititnore: adds CMakeLists.txt.user and CMakeLists.txt.autosave

* deps_src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* removes #pragma once from .cpp file
 2025-09-19 23:45:03 +08:00
coryrc
94cc5465f1 Fix variable name comment and message (#10302) 
As you can see, it's checkin the local variable
`custom_gcode_placeholders` which comes from
`custom_gcode_specific_placeholders()` which is:

```
const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders()
{
    return s_CustomGcodeSpecificPlaceholders;
}
```

not s_CustomGcodeSpecificOptions
 2025-09-19 22:41:25 +08:00
Bastien Nocera
e8203b81b2 FIX: Fix missing std::regex declaration 
/run/build/BambuStudio/src/libslic3r/FilamentGroupUtils.cpp: In lambda function:
/run/build/BambuStudio/src/libslic3r/FilamentGroupUtils.cpp:92:18: error: ‘regex’ is not a member of ‘std’
   92 |             std::regex r1(R"(^Sup.(\w+)$)");
      |                  ^~~~~

(cherry picked from commit bba6fa71a4a7fb931a93b9e5aa3be02865a0357e)
 2025-09-18 23:01:09 +08:00
Bastien Nocera
b8b83a6f15 FIX: Fix missing std:: declarations in ToolOrderUtils 
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.hpp:14:26: error: ‘numeric_limits’ is not a member of ‘std’
   14 |     const int INF = std::numeric_limits<int>::max();
      |                          ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.cpp:545:66: error: ‘unordered_set’ in namespace ‘std’ does not name a template type
  545 |     static std::vector<T> collect_filaments_in_groups(const std::unordered_set<unsigned int>& group, const std::vector<unsigned int>& filament_list) {
      |                                                                  ^~~~~~~~~~~~~

(cherry picked from commit 059e18aa38ccc715a6c1f2dc1ceb9af1940c7a17)
 2025-09-18 23:01:00 +08:00
Bastien Nocera
ff9f223042 FIX: Fix missing boost::algorithm::split declaration 
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp: In function ‘std::vector<std::map<int, int> > Slic3r::get_extruder_ams_count(const std::vector<std::__cxx11::basic_string<char> >&)’:
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp:454:27: error: ‘split’ is not a member of ‘boost::algorithm’
  454 |         boost::algorithm::split(ams_infos, str, boost::algorithm::is_any_of("|"));
      |                           ^~~~~

(cherry picked from commit bf32b5a489670df588ee2ac217275c6c0b8170ba)
 2025-09-18 23:00:51 +08:00
Bastien Nocera
1f00b9e8e7 FIX: Fix missing L() localisation helper 
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp: In member function ‘unsigned int Slic3r::PresetBundle::sync_ams_list(std::vector<std::pair<Slic3r::DynamicPrintConfig*, std::__cxx11::basic_string<char> > >&, bool, std::map<int, Slic3r::AMSMapInfo>&, bool, Slic3r::MergeFilamentInfo&)’:
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp:1973:49: error: ‘L’ was not declared in this scope
 1973 |                     unknowns.emplace_back(&ams, L("The filament model is unknown. Still using the previous filament preset."));
      |                                                 ^

(cherry picked from commit a8d792ecf8508c030e27aae139eeaf45884ebdc7)
 2025-09-18 23:00:10 +08:00
Bastien Nocera
81ae29d82f FIX: Fix missing offset() helper declaration 
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.cpp:3327:26: error: ‘offset’ was not declared in this scope; did you mean ‘off_t’?
 3327 |             outer_wall = offset(outer_wall, scaled(spacing)).front();
      |                          ^~~~~~
      |                          off_t

(cherry picked from commit c77afa7096c48c2b3e2559b39252bafca3f87b28)
 2025-09-18 21:53:18 +08:00
zhimin.zeng
95e97e09fc FIX: fix build error 
jira: none
Change-Id: I97df69b728fc3871b7c33e1fd3ba068e741d51c7
(cherry picked from commit 326d7d28b47017bdbd98873a6437ef84116291ba)
 2025-09-18 20:22:29 +08:00
xun.zhang
3794d2bbfc ENH: update flush table 
1. For cases where light color switch to dark color, multiply the value
with 1.3

jira : NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6b5b2f8e9578d031bbf830ecf18f0069865af2e6
(cherry picked from commit cfa54c55058cd9ed2bd76de7a1158b06bf3501a9)
 2025-09-18 17:15:05 +08:00
zhou.xu
13d3cfda63 ENH:Text not centered on mac15 
jira: STUDIO-11056
Change-Id: I1c651421f8914a25707ad5b5c1d3e3d56c2df959
(cherry picked from commit 7af3eba50047c4b5f852f2ac3814243543a5019a)
 2025-09-18 17:08:18 +08:00
jiangkai.zhao
bca7f73f7f Fix: error the contact layers of different categories 
jira: none
Change-Id: Ife5508427e0c09527489f1ff973d27463650d60a
(cherry picked from commit 6a927ebb5539cf866e04c309c723fca91f573ee8)
 2025-09-18 17:04:59 +08:00
xun.zhang
81382448eb ENH: update flush data for H2D 
1.Alsoe set default flush from support to 700

jira: STUDIO-10595

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0d0a85cdac5e63b787c16b35ed6c05afc885a715
(cherry picked from commit 5fea5e6696a28d7ec9edcde38c43700cb3b7f596)
 2025-09-18 16:49:36 +08:00
zhou.xu
e7e8fab7a0 ENH:is_bbl_3mf pointer should determine if it is empty 
jira: STUDIO-11031
Change-Id: I14c6daeb275a82d019f88246b23013163a14ded1
(cherry picked from commit aa7fbd4926254be62ccee40b0a7d23b90a109675)
 2025-09-18 16:43:09 +08:00
chunmao.guo
484d70efb5 FIX: show sync ams unknown details 
Change-Id: I1febb10b73a87f98a477fea5fbe2583c752ab330
Jira: STUDIO-10969, STUDIO-10973, STUDIO-11011
(cherry picked from commit f1eb5e829288236282e2322a961e012884ad90cf)
 2025-09-18 16:42:09 +08:00
xun.zhang
a0f38f3cfd ENH: add layer num in filament end GCode 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6f81b86a7b7391048d70f2c4839733a69015e53b
(cherry picked from commit aafcfd72f40dd221286b757da9d494498d36374c)
 2025-09-18 16:40:37 +08:00
xun.zhang
cd16bd83a3 FIX: translation problem 
1. add regroup link

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia90c80f5ff86e785e00fb0c38360eb33424a5ddd
(cherry picked from commit 01be3a51e646a9ca4277c490396417c95d983648)
 2025-09-18 16:38:26 +08:00
zhimin.zeng
e011b54d3f FIX: fix the error wipe path 
jira: none
Change-Id: I34af54711531b208049cbbc3883bca92328b9b5a
(cherry picked from commit da3819f52f5454075342e8565fe9020773aa25ef)
 2025-09-18 16:27:37 +08:00
lane.wei
1eb3bc177e ENH: CLI: check filament mapping error before process 
jira: no-jira
Change-Id: Ie82a1faba93a4f80281615c803a45a93206ddf02
(cherry picked from commit 5869d33d519b617dbcee05a74f81fb1951330633)
 2025-09-18 16:19:24 +08:00
zhou.xu
5113b2c2dc ENH:the "distance" var should init to 0 in the release environment of Mac 
jira: STUDIO-10967
Change-Id: I85b1e87dc80846f50c3bd29c7aa05f89c39d17de
(cherry picked from commit 4b368cb2ecafd53ad1bbe61946bb9b1bafce64cb)
 2025-09-18 16:16:20 +08:00
lane.wei
9c4c5ba915 FIX: config: add some error process logic when loading 3mf 
jira: STUDIO-7956
Change-Id: I13084cfe5233da9e928dc8eb10d8ffe1bc38080c
(cherry picked from commit 2ccc72f16eab50ea9c354c4214999c702bb9ba08)
 2025-09-18 16:16:13 +08:00
zhimin.zeng
bf0f98b0eb FIX: apply unprintable filament type to limit filament map 
jira: none
Change-Id: I81e22dc28bc416a1b26c242fab4e054f597b064e
(cherry picked from commit 9b81b9e2d4c6b39329e94efe3e433564c66f6ffe)
 2025-09-18 16:14:01 +08:00
xun.zhang
f4445d0c04 ENH: optimize group logic for unprintable filaments 
1.Also fix a tip mistake

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia52f95988d467a7018579a774376578b83e7ca05
(cherry picked from commit 804fe8d124e916f5957244913a50d24aceb621bd)
 2025-09-18 16:13:25 +08:00
zhou.xu
cc12de18e0 FIX:Thumbnail render should use light in "obj import" dialog 
jira: none
Change-Id: I1457876a12f42abd93d26cebb60d2d7d8075df74
(cherry picked from commit 7768570492a59afdac0add126bceb6cf0d86b210)
 2025-09-18 16:11:13 +08:00
zhimin.zeng
0c5c3410d6 FIX: adjust nozzle_change_gcode before filament_end_gcode 
jira: none
Change-Id: I56498d473568ef0f5a7ba7c149befff55016bda1
(cherry picked from commit 310f13f36a96d8b898edd651cfcf75251ab9fd9d)
 2025-09-18 16:11:02 +08:00