3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-26 17:48:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
25096 commits 11 branches 72 tags 1.8 GiB
Commit graph

25096 commits

This branch
This branch
All branches
Author SHA1 Message Date
Noisyfox
2ce2facb0e Add network debugging 2025-05-12 21:51:34 +08:00
Noisyfox
3f60a23718 Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/Widgets/AMSControl.cpp
 2025-05-11 21:17:43 +08:00
yw4z
a008014ab0
Improvements for Default color button in filament settings (#9581)
Some checks are pending
Build all / Build All (push) Waiting to run
Details
Build all / Flatpak (push) Waiting to run
Details 
* init

* fix colors on theme switch

* update

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
 2025-05-11 20:11:09 +08:00
Alexandre Folle de Menezes
43b2acba36
Use "°C" instead of "degree" to avoid ambiguity (#9597) 2025-05-11 15:06:30 +08:00
Alexandre Folle de Menezes
3e48390cee
Remove markers from strings that don't need to be translated (#8842) 
Remove markers from text that does not need to be translated
 2025-05-11 15:04:48 +08:00
yw4z
75dd55fcf6
fixes for dependencies tab (#9594)
Some checks are pending
Build all / Build All (push) Waiting to run
Details
Build all / Flatpak (push) Waiting to run
Details 
* init

* fix indent
 2025-05-10 22:13:28 +08:00
yw4z
41ff632d28
Improve UI of profile dependencies tab (#9553)
Some checks are pending
Build all / Build All (push) Waiting to run
Details
Build all / Flatpak (push) Waiting to run
Details 
* init

* Update Tab.cpp

* update labels

* Update Tab.hpp

* Fix checkbox label

* Update Tab.cpp

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
 2025-05-10 13:49:52 +08:00
Kiss Lorand
cc525608e9
Organic tree support GUI fix (#9587) 2025-05-10 12:50:12 +08:00
Noisyfox
4d25037614
Merge branch 'main' into dev/bbl-network-upd 2025-05-09 23:03:47 +08:00
Noisyfox
0cc495b425
Make Custom GCode Editor resizable (#9405)
Some checks are pending
Build all / Build All (push) Waiting to run
Details
Build all / Flatpak (push) Waiting to run
Details 
* Make gcode editor window resizable

* Make param list expands with the window

* Make dialog shrinkable and give it a proper initial size

* Revert "Hardcode Location of Add Button"

This reverts commit aef74ab005.

* Make sure the dialog fits inside current screen

* Fix compile error
 2025-05-09 23:00:27 +08:00
Noisyfox
0c4f778ddb
Fix crash when switching back to prepare tab after clicking the support paint icon in preview (#9417) 2025-05-09 22:59:18 +08:00
Noisyfox
b0b6e000f2
Don't show "remember my choice" on 3mf open dialog (#9547) 
Don't show "remember my choice" on 3mf open dialog (SoftFever/OrcaSlicer#9108)

Lots of people accidentally checked it without realizing the consequences, now we make it more explicit by
only allowing change this in preference settings.
 2025-05-09 22:58:46 +08:00
yw4z
2fbfb70994
Fix filament type parameter box uses wrong width (#9582) 
* Update Tab.cpp

* Update Tab.cpp
 2025-05-09 22:54:35 +08:00
Noisyfox
9b18c82bfb
Fix crash when start_extruder_id is empty (#9584) 
Fix crash when `start_extruder_id` is empty (SoftFever/OrcaSlicer#9580)
 2025-05-09 22:47:18 +08:00
yw4z
f0384e7bc3
Color & shape improvements for Axes (#9495)
Some checks failed
Build all / Build All (push) Has been cancelled
Details
Build all / Flatpak (push) Has been cancelled
Details 
init
 2025-05-08 16:00:48 +08:00
yw4z
92b31a6435
Improve quality of bed name / number texture (#9535) 
* init

* update

* update

* update

* update

* update

* Update PartPlate.cpp
 2025-05-08 12:33:57 +08:00
yw4z
13225c817a
Increase size of layer mode button on preview tab (#9554) 
* Update IMSlider.cpp

* fix slider positions
 2025-05-07 23:33:33 +08:00
Noisyfox
fe0f6497ad Fix external filament calib 2025-05-07 21:31:42 +08:00
Noisyfox
37244cce95 Update to latest BBS code. Fix ams filament preset check 2025-05-07 20:42:23 +08:00
tao wang
406ccadd06 ENH:use the correct trayID 
jira[STUDIO-11274]

Change-Id: I0025bb74002b00c448fd4a499e547a5fbd35537f
(cherry picked from commit 937f687169091982bc6f11c5e76fb823b0456590)
 2025-05-07 18:45:18 +08:00
tao wang
48ec9edc51 ENH:command ams filament settings is compatible with all AMS 
jira:[none]

Change-Id: I622300794d1fa14826847229737b1f6f2ae490db
(cherry picked from commit c2adbe140b134b958f589ba178286e245a09adbf)
 2025-05-07 18:13:03 +08:00
Noisyfox
ca68aa6d2b Fix compile error 2025-05-07 16:57:28 +08:00
zhimin.zeng
92972879f5 FIX: modify for get pa cali result 
jira: none
Change-Id: I3c57ccaac3b7e73e0b2eb0e26678635478480298
(cherry picked from commit 6bf39690517f9e25de895bf52673d3a4a7b77255)
 2025-05-07 16:38:26 +08:00
Noisyfox
b4f1ef06a2 Fix compile error 2025-05-07 16:36:00 +08:00
Noisyfox
108a5b8344 Update naming 2025-05-07 16:35:57 +08:00
zhimin.zeng
2ee934a7ee FIX: cannot cali for single nozzle printer 
jira: none
Change-Id: I1cc0e5e4b0f9db2a66694c894f96a14047fde9e5
(cherry picked from commit 7bd3a5218af9f3d172090a80da447c4f2bbfff61)
 2025-05-07 16:35:35 +08:00
Noisyfox
f6bfad9de1 Fix wrong slot id 2025-05-07 16:35:34 +08:00
tao wang
b0872aaba9 FIX:Fix the issue of extruder matching errors 
jira:[for nozzle match]

Change-Id: I6965500bfb7feef6d18d28bea8a53a3c477f5e36
(cherry picked from commit 7bcf4b6cc5bc38e723bfd8dcd495c60a55134490)
 2025-05-07 15:49:21 +08:00
zhimin.zeng
7c5dee1eda ENH: support auto pa cali for multi_extruder printer 
jira: none
Change-Id: I835a0e20de81f9af7c40983e00bdb37ea6c95a68
(cherry picked from commit 4e387d4ace4332a7c2b6c0ab695b80a51597d0c7)
 2025-05-07 15:46:24 +08:00
zhimin.zeng
2db5cae51f FIX: crash when sending print with empty ams_id 
jira: none
Change-Id: I89dc87af28b45c69eac86810444de2519dfccd08
(cherry picked from commit f53e00ec6d9350046df4b9dc70cec75039b6d5d1)
 2025-05-07 15:37:22 +08:00
zhimin.zeng
72fa3fbb26 FIX: modify color to empty string when reset filament 
jira: none
Change-Id: I3a32dc8307ec5d65c8c5b7b05a5bc1e2d7d2b5b7
(cherry picked from commit a0b563dc8fbddd201198dd073471887d104a58cb)
 2025-05-07 15:36:05 +08:00
hang.xu
df3fe1491a FIX: crash when select filament in device 
jira: STUDIO-7972

Change-Id: Ice9e7360fbfe0c07bd49bbd696bb3cfb662e94e4
(cherry picked from commit 4c644d47157dd5cc403d6a1640c5874b99b10c4a)
 2025-05-07 15:33:36 +08:00
zhimin.zeng
e9e661a9db FIX:when ams cali_idx is unknown, use default item 
2. use transparent color when reset filament
jira: 7946

Change-Id: I129dc0e6b7244cad3b5e61e1bc423938f4b92d7e
(cherry picked from commit 7f473c2027e31458664e184645cf46f8e9b5d307)
 2025-05-07 15:32:23 +08:00
zhimin.zeng
8a89c159db FIX: modify for virtual slot when multi_extruder 
jira: none
Change-Id: Ic7284018ecb44e24536788b05dba572b96460e66
(cherry picked from commit 52e890fba1584bf9687a24ee46890c00f531e383)
 2025-05-07 15:30:04 +08:00
zhimin.zeng
11cc964352 FIX: pa default item add filament_id 
jira: none
Change-Id: Icfc24390e62cc1eca7e670311dc88502cea16fd7
(cherry picked from commit fb72d19a44d3b916920373acb7dd359282c1b750)
 2025-05-07 15:21:07 +08:00
zhimin.zeng
500d1835a8 FIX: add filament_id when reset ams setting 
jira: none
Change-Id: Iedd2eec94bd1e41a51cededc06b304a2e29ef808
(cherry picked from commit 4c6316b98137dc230c6a0c2093ffb290c09ccef7)
 2025-05-07 15:20:49 +08:00
tao wang
1f08ec6072 FIX:use old tray_id for set ams filament 
jira:[ams setting]

Change-Id: I965f532fbd590b501b40c2cc812d6d02054b3628
(cherry picked from commit ee3cb45b4d49d05417a6a4735e2cdd5050bc35c5)
 2025-05-07 15:20:36 +08:00
tao wang
d71b1b57e2 FIX:fixed unable to reset ams filament setting 
jira:[for reset ams]

Change-Id: I9f2f8be4a6e16b05191e4076db4e3f53d7601db4
(cherry picked from commit 3119a84eb2af58b89113f03c4393d1062423f930)
 2025-05-07 15:18:02 +08:00
tao.wang
45dd04c899 ENH:support set ams filament 
jira:[for 2nozzle setting]

Change-Id: Ib9e20bcdf6d8ea1bf5dd5e8624a68730e05e69ad
(cherry picked from commit 78c592819473b1291d1bec1126ccbf7d86bb17d5)
 2025-05-07 15:13:39 +08:00
tao wang
319827daec ENH:support parse new print data 
jira:[for new print data]

Change-Id: Iac6747e9ade690fcdf3b7b11239fe183bc7c3796
(cherry picked from commit 6c02c7bc8c77a481253e6c574f7bc13ff2cfcbdc)
 2025-05-07 15:01:17 +08:00
zhimin.zeng
89a225a0e1 ENH: add default item for pa 
jira: none
Change-Id: I4ad3bd094325bdbd1e6b013a91766214951dc032
(cherry picked from commit 0c772105f946121c292f92ab3ca1d050b898311b)
 2025-05-07 14:33:38 +08:00
zhimin.zeng
693cf5f2f4 FIX: the default value is not correct 
and the pa profile not display in AMS setting dialog after switch nozzle diameter
jira: 8620

Change-Id: If40bfe41ae13f5199f09baae3af09757498f1edf
(cherry picked from commit f3064e223df468eb9901e65c8f0abab2dae91f15)
 2025-05-07 14:27:03 +08:00
tao.wang
d77ef4c8a3 FIX:fixed some amscontrol issue 
jira:[for fix amscontrol issue]

Change-Id: Id62ffd047403bf80f6aba732b8ce31d782bcea57
(cherry picked from commit 55898ab88ee844dd7da17d992ad8f79e439f96a0)
 2025-05-07 14:27:02 +08:00
Noisyfox
afb1d3df6f refactoring the modules of amscontrol 
adapted from bambulab/BambuStudio@b78fa4c11c

Co-authored-by: tao wang <tao.wang@bambulab.com>
 2025-05-07 11:30:29 +08:00
Noisyfox
dad7320f4b Fix setting AMS calib profile 
ENH: calib support multi_extruder

1. backend support multi_extrude data structure
2. Compatible with third-party calibration

(cherry picked from commit bambulab/BambuStudio@21e6271e59)

Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
 2025-05-06 23:04:35 +08:00
Noisyfox
9b9c9ba569 Merge remote-tracking branch 'remote/main' into dev/bbl-network-upd 2025-05-05 19:22:34 +08:00
xun.zhang
d40be52f18 FIX: wrong curr bed type in print page 
1.Get bed type from project config

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1f1b9185dd4592b5fd3b03f07e8cde7b7d26510e
(cherry picked from commit 1c90355199384903f166730c5bb43c6a6baaa1cf)
 2025-05-05 19:18:39 +08:00
tao wang
c4c670c995 FIX:fix the issue of macOS crashing easily 
jira:[udesk 7578206]

Change-Id: If5e0b2d0969ca70815a5d2c9cca71654c9e1817b
(cherry picked from commit 8dfa6839e5e3a9bebb03616ff6d0c0c1699ad22f)
 2025-05-05 19:18:13 +08:00
hang.xu
c5c3fdc321 FIX: Bed type display 
jira: none

Change-Id: Ibac2a7a80d6841ebea639e0a58547413df6f5c74
(cherry picked from commit 2c3fa062c92da50f839432a43356d491c2e5bbba)
 2025-05-05 19:13:50 +08:00
hang.xu
78a09d9be6 FIX: Add bed type in send print page 
jira: STUDIO-7824

Change-Id: I64d9ed41b862ed4e3b8c21218c289132d767105e
(cherry picked from commit 7bb5060b739b3a95fe889ae64e8d7289e2c928d9)
 2025-05-05 19:10:45 +08:00