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
26,827 Commits 17 Branches 77 Tags
41f7bea34b1f9bf2d7cf7d7714dcef5d5c8bef35
Commit Graph

15663 Commits

Author SHA1 Message Date
xin.zhang
41f7bea34b FIX: use cloud HMS 
jira: [STUDIO-11126]
Change-Id: I6bbc7163c2f47f38f3ea614d71f534dc4ecd9835
(cherry picked from commit af658c653e9c5fd6280cc9ddd1cddf6cfc794ffb)
 2025-09-21 13:47:51 +08:00
xin.zhang
b474eb0613 FIX: erase the access code records while empty 
jira: [STUDIO-11102]
Change-Id: Iab43485789f74e635b7de195cbe8683f6b9e9be6
(cherry picked from commit 9441a32ca363aad727cf8c66e2f61953598a15a3)
 2025-09-21 13:47:51 +08:00
tao wang
426b5900ee ENH:compatible with AMS exist flag 
jira:[none]

Change-Id: I6afeafe0676eded86f83838576d67233f50ee509
(cherry picked from commit a182fa1aa4a3bdd32c4ccfa26adcd92a9f1cca37)
 2025-09-21 13:47:51 +08:00
tao wang
55586bbaf6 ENH:X1E supports nozzle types 
jira:[none]

Change-Id: I056d04cbc08f0b29eeedc6cb0d7261e48c04611d
(cherry picked from commit 8f94e72c1639cacbce54623e95897296377642c5)
 2025-09-21 13:47:51 +08:00
tao wang
6d739dde47 ENH:adjust the layout display of a single AMS 
jira:[none]

Change-Id: I801daa5f3a8ee1b3f03037eb4edf881071ea67db
(cherry picked from commit cbd69328318c18a2040a04b24ae8cd5340523ce0)
 2025-09-21 13:47:51 +08:00
tao wang
4f7e8e32a4 FIX:fixed the issue of no mapping data when use ext only 
jira:[none]

Change-Id: I8dc94514ffa67c13a3c3f52f09e5ef0b997ad568
(cherry picked from commit 8cd51301ad6e32018873abae487dfcec1a2fd8e5)
 2025-09-21 13:47:51 +08:00
tao wang
8ac5ca4e3d ENH:use new command based on AMS type 
jira:[none]

Change-Id: I9411aa5b673b4270fe468a07c38d9966bd31a29a
(cherry picked from commit 83de229aa1306e80646b69ea7ba02f6b2e58f818)
 2025-09-21 13:47:51 +08:00
tao wang
ae435eb74c ENH:hide use ams option 
jira:[none]

Change-Id: Icfb93d9f16055cd6e53f3465759b435cf5926eec
(cherry picked from commit 8c3304723e78337230bb6b00fad14fb2a27912f3)
 2025-09-21 13:47:51 +08:00
xun.zhang
adc00b2794 FIX: slice btn can't click in ubuntu 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8566dcba151d02df56097dd5add08e45a876a9e8
(cherry picked from commit a210dbdf2ef06c9cb56cb81211515d7005795cdd)
 2025-09-21 13:47:51 +08:00
xun.zhang
057b85f8a2 FIX: crash in ubuntu when doing group 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ib69be6fdc18918c9d9ae0c840b7dfa6bd4977365
(cherry picked from commit 55f79b273790ff25b2bde5b07011ef9bb4760c4a)
 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
c743085c4e ENH: add "Don't show again" to fan speed control 
jira: [STUDIO-11231]
Change-Id: I160d122155302195edf4b97e8b92e96350f9d600
(cherry picked from commit 0ba097de36efd077244ea3d1f435c9e5dc7f9637)
 2025-09-21 13:47:51 +08:00
xin.zhang
c38fa41fab FIX: Enable set nozzle for undefined nozzle; Enlarge Combobox width to show texts 
jira: [STUDIO-11229]
Change-Id: I559712f7ce13e4ff7318a2e51fe7f18893372f2c
(cherry picked from commit f9eecbb4b7a3d54a5dad68882678c4a1cf9eb678)
 2025-09-21 13:47:50 +08:00
jun.zhang
179d68ca37 FIX: imgui key event related issue 
jira: github-6167

Change-Id: I30be4c4df4ef8eea695fed73ace1d380e790bf76
(cherry picked from commit 8c755cbca108f4f0d1a78d8296cd503caf5c0ca7)
 2025-09-21 13:47:50 +08:00
jun.zhang
649eacd801 FIX: gcode viewer: always update top_layer_endpoints if top_layer_only is enabled 
jira: STUDIO-11141

Change-Id: I1c8eb3234401ee64576212a08764170577855a8c
(cherry picked from commit 2c718bb376c4d26249f1942e9f076bf6e99d9f23)
 2025-09-21 13:47:50 +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
xin.zhang
8eee80286b ENH: print origin package at info level; remove indents 
jira: [none]
Change-Id: I8130951c8b451d7e8ce164e70d70b84e542c5a22
(cherry picked from commit 8fbbf8f34ffc41a414a0904b00cc163df30d056a)
 2025-09-21 13:47:50 +08:00
xin.zhang
aa70322e87 ENH: reduce log files; no need to log out if nothing changes; switch log level to info 
jira: [none]
Change-Id: I72066576085fd99a032383cb52f24f2e87adb9c3
(cherry picked from commit 40183c40748f6ce63a07e18d4ab2bc1c79353a21)
 2025-09-21 13:47:50 +08:00
zhou.xu
36cd741a3e FIX:delete the code for connecting to the machine and switching to a combo box 
jira: github 6231
Change-Id: Ic0b043ae4bd27d3a6d41bf4a6b3f95dd532fecee
(cherry picked from commit 8df494e35825008c51440ba6e588ce2bdd710cbd)
 2025-09-21 13:47:50 +08:00
zhou.xu
2d3d68c922 ENH:When the AMS option is turned on or off, update the correct thumbnail 
jira: none
Change-Id: Ia001e4baa7de72ab077cf0fb76c45d4cb8bac088
(cherry picked from commit 89aa62f8b4cd11fa10a898956f1c57ae1ef64a70)
 2025-09-21 13:47:50 +08:00
zhou.xu
c2a2f06b8a FIX:Fix gradient material display issue 
jira: none
Change-Id: Ia7877fc297e77e28e630ade6c8c9826f99df0ed4
(cherry picked from commit e58b96e79eb7a9d43a9b35f49ec92d8c97f281e0)
 2025-09-21 13:47:50 +08:00
zhou.xu
72fce85874 FIX:empty plate slice state should set to UNSLICED 
jira: github 6276
Change-Id: I1a25cb2920806fc09f6d666bf043433837190ac2
(cherry picked from commit 61204671b0b462f49363d11e2bff79958bba031c)
 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
zhimin.zeng
5dd1bc9a81 FIX: add filament id to filament_ids when send cali job 
jira: none
Change-Id: I6e3e8c38b67fe62442fa369f072fd1743f35f38f
(cherry picked from commit ec9193ffb06e12411b4e521c12d9e16f121f54d1)
 2025-09-21 13:47:50 +08:00
xin.zhang
42fe1d4f8b FIX: recheck if the ext is used 
github: [issues-6179]
Change-Id: I12a5ca2d3873f798d5d195adaf64abfec1f3245d
(cherry picked from commit 2c10531348d4b535e8ca49294e78d0ddf9da467d)
 2025-09-20 15:37:23 +08:00
maosheng.wei
6aa49dcc12 FIX: Material name transcoding issue in AMS Materials Setting 
github: #6190

Change-Id: Ie43cf9ab9b59b0cb9e7b03a61601716f6fff2217
(cherry picked from commit 33193459219c7b39a2cd0ee1dfc8c57e39cfa755)
 2025-09-20 15:37:16 +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
洋葱
220d2fd574 Revert "ENH:direct connected devices support fram mode" 
This reverts commit dc032e6b719d5d3526f9e757dde884e32583be46.

Reason for revert: <just reverts>

Change-Id: I7e9050cd48d59270fb23b6430990a2c88f3fabab
(cherry picked from commit be08d1d793acf104e1d541c2bd2a49f868ed6189)
 2025-09-20 15:36:07 +08:00
zhimin.zeng
00f5812aba FIX: fix the error display for ext slot 
jira: none
Change-Id: I940554e6b1a5c8c609561670db79948c9efed63d
(cherry picked from commit 72b5ab7ee4f59287dd1888c1c4a1f86466fc1afe)
 2025-09-20 15:31:33 +08:00
zhimin.zeng
3d5abeba60 ENH: Updated calibration UI for single-extruder printer 
jira: none

Change-Id: I4e2d97f38699b13e2bced8f6a37c952f7903aa27
(cherry picked from commit 2e3a5e8ca71e3e9426412f8bd07b916f6be45aed)
 2025-09-20 15:31:26 +08:00
xin.zhang
fcfb6ac093 FIX: show ams remain for MAC 
jira: [STUDIO-11139]
Change-Id: If5b9593e0b46e3f6845bb5637564cee8fa67e5bc
(cherry picked from commit 2d99a9e23106a631f9d1875f71f0910b093de657)
 2025-09-20 15:30:19 +08:00
xin.zhang
f9a7f056e9 FIX: use different ext image for different machine 
jira: [STUDIO-11133]
Change-Id: Ice69b4f33317e23a2c2d7b8fbdfc94402b4bba28
(cherry picked from commit a67acd8f0ced49052cfe0c4b01a5bf159b046e85)
 2025-09-20 15:30:14 +08:00
zhou.xu
327f64c093 ENH:add "is_blocking_printing" api 
jira: github 6181
Change-Id: I8c8659da0b27204c53d03cbbd8d410504b3fd434
(cherry picked from commit c52681071782d137338436640cd990057579949b)
 2025-09-20 15:30:09 +08:00
tao wang
157bec00a1 ENH:auto switch use ams option 
jira:[none]

Change-Id: Ia1d5231284515226277b16d771342141e654a23d
(cherry picked from commit 956f1b9a59c11bce0428c3162beac45a5272c919)
 2025-09-20 15:30:05 +08:00
tao wang
2bc9cb4441 ENH:direct connected devices support fram mode 
jira:[none]

Change-Id: I539698e6440bf67b1951938c3c0b7d51ab74c1b3
(cherry picked from commit 1b0e8cdb318eb67c5d791835a09cccb1e1e7d9fe)
 2025-09-20 15:29:59 +08:00
zhou.xu
6c03cd6178 FIX:fix dark mode show of right_tip 
jira: none
Change-Id: I6ce7edec772c5d1bbdc372fcde25807a0a744916
(cherry picked from commit 36692d649c13a0a3cec95fbf12960dcc91970d8c)
 2025-09-20 15:29:52 +08:00
zhou.xu
a65abbeb58 FIX:m_show_type should init default 
jira: github 6146
Change-Id: Ie948a37cfda030a9e10efe0b8d260918b3fb9e4c
(cherry picked from commit 28bdf64fef8d7cbef15f27ffcc2c841595ba08c7)
 2025-09-20 15:28:40 +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
bc9e0066e7 FIX: Fix missing wxDC declaration 
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp:44:56: error: ‘wxDC’ has not been declared
   44 |     static void get_suitable_font_size(int max_height, wxDC &dc);
      |                                                        ^~~~

(cherry picked from commit 7f24d5123766fbcfcec6f1343eefa32edb6254d6)
 2025-09-18 23:02:19 +08:00
Bastien Nocera
22d6e9de2b FIX: Fix missing wxBitmap{,Button} declaration 
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:17: error: ‘wxBitmapButton’ was not declared in this scope
   60 |     std::vector<wxBitmapButton*> radio_btns;
      |                 ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:32: error: template argument 2 is invalid
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:65:14: error: field ‘checked_bmp’ has incomplete type ‘wxBitmap’
   65 |     wxBitmap checked_bmp;
      |              ^~~~~~~~~~~

(cherry picked from commit ab345221437f52606c54c76fd9837bd9dad98d1c)
 2025-09-18 23:02:15 +08:00
Bastien Nocera
0cc427ec41 FIX: Fix missing wxTimerEvent declaration 
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:33:18: error: ‘wxTimerEvent’ has not been declared
   33 |     void OnTimer(wxTimerEvent &event);
      |                  ^~~~~~~~~~~~

(cherry picked from commit b890f0a39fcb48a1f1e1ee01f2aacf5d2fa35ad6)
 2025-09-18 23:02:11 +08:00
Bastien Nocera
7ef078c94d fixup! FIX: Fix missing FilamentMapMode declaration 
(cherry picked from commit 13624fb941bedd9afd130fe6209db93f2e4236a9)
 2025-09-18 23:02:07 +08:00
Bastien Nocera
ce41091f28 FIX: Fix missing wxDisplay declaration 
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp: In constructor ‘WipingDialog::WipingDialog(wxWindow*, const std::vector<std::vector<int>, std::allocator<std::vector<int> > >&, int)’:
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp:123: error: ‘wxDisplay’ was not declared in this scope; did you mean ‘wxGetDisplay’?
  123 |     double scale_factor = wxDisplay().GetScaleFactor();

(cherry picked from commit c6f2b0e950e607b24a74e797534e0aa7f6216d6f)
 2025-09-18 23:02:03 +08:00
Bastien Nocera
56c5d370b4 FIX: Fix missing Slic3r::intersection declaration 
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp: In static member function ‘static ImVec2 Slic3r::GUI::ImGuiWrapper::suggest_location(const ImVec2&, const Slic3r::Polygon&, const ImVec2&)’:
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp:2201: error: ‘intersection’ is not a member of ‘Slic3r’; did you mean ‘PrinterFunction’?
 2201 |         if (Slic3r::intersection(interest, Polygon(moved_polygon)).empty())

(cherry picked from commit de2b5b74cecda595d75fef894da4a92936e0cb7f)
 2025-09-18 23:01:59 +08:00