3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-29 02:40:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
25800 commits 11 branches 72 tags 1.8 GiB
Commit graph

262 commits

Author SHA1 Message Date
tao wang
44e09c2fea FIX:fixed incorrect layout without AMS 
jira:[none ]

Change-Id: I7cda157a149b89820b7936eb058a7ad8058d9e4b
(cherry picked from commit 5550b96305086684084cf538656e9bfada14f164)
(cherry picked from commit d1932d8c982c54fe8796d097464b0805db241a13)
 2025-09-05 19:13:24 +08:00
tao wang
1ed2c423d6 NEW:new extrusion command 
jira:[none ]

Change-Id: I721ce4b2eb5ab02a88dc370f14bbfdb1b91f40a1
(cherry picked from commit 79c534375f7650480208a662e0a8302bc4ff6c45)
(cherry picked from commit 7dd335f134e663ec3d2817dbea0d0077c9fcb986)
 2025-09-05 18:13:13 +08:00
tao wang
bf247fba0f FIX:Fixed incorrect printer status 
jira:[fixed device issue ]

Change-Id: Ibab8db09854adca1e80acaf3831c6e4191e137c7
(cherry picked from commit 0572d811780ac406214665af7748e4ba8243bdc8)
(cherry picked from commit b60cdcfed85b1dc89c23ee21cb613e5be86eb14d)
 2025-09-05 18:12:50 +08:00
Kunlong Ma
5233702681 NEW: new fan ctrl 
JIRA: none

Change-Id: I4e84d455fa728dffb00706f4c07310fcd1b8335c
(cherry picked from commit 0a739fe087933cc89af541817315c7a3d6096b22)
 2025-08-28 11:29:00 +08:00
tao wang
21b67d993f NEW:new fialment load/unload process 
jira:[none]

Change-Id: Ie0076d5c7ec619414121c1f6d37876aaa4e044c1
(cherry picked from commit 5d9a7eaadcd5ab6dc2f18e65000ead81e7e8adb6)
 2025-08-28 10:35:06 +08:00
tao wang
592734dbf7 NEW:support led control 
jira:[device page]

Change-Id: Id1ce67262a2c70e93425c0c79f2f3b2fd0a747a6
(cherry picked from commit b89aa86a8ecabbafdd5a4201f0cec24a9db87db8)
 2025-08-26 20:12:52 +08:00
tao wang
f2598e0265 NEW:support multiple extruder new control 
jira:[device page]

Change-Id: Idf68a3385172cbaa123cedb4e2b814c15cc09f07
(cherry picked from commit 7700b911a6fec782ce6b484b9b030963283a846c)
 2025-08-26 20:12:40 +08:00
zhimin.zeng
bd3b69abf9 FIX: fix crash bug when switching resolution 
jira: none
Change-Id: Ie1879a2a120502db2f2a9b3b8cac1f8a2b9737f9
(cherry picked from commit 28d0fc9bbe40386f799aa3dab3367aed56fe0d0a)
 2025-08-24 23:18:27 +08:00
tao wang
99f0e35069 FIX:fix some new ui issues 
jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
(cherry picked from commit 65e8b4ee7e816cc313e8d7a33f06c6f1638dceef)
 2025-08-24 23:18:22 +08:00
hang.xu
291225ae35 FIX: Aix and temp control 
jira: none

Change-Id: I7a9db8178a77727c85ad2b727771179fc5e8050a
(cherry picked from commit e6b14bdefb949d3a61479e54b7b27450b344de18)
 2025-08-24 23:18:19 +08:00
Noisyfox
d6e219c52f Fix build error 2025-08-24 23:18:13 +08:00
hang.xu
5474cff20c FIX: Parse virtual slot info 
jira: STUDIO-7724, STUDIO-7725

Change-Id: Id9181511b7503787fe06403be6ecb782d78cb21e
(cherry picked from commit 286eca79c2c0824522f0917123c9315f8df65dee)
 2025-08-24 23:18:13 +08:00
hang.xu
6b3ccc543d FIX:Change text in stop printing dialog 
jira: STUDIO-7899

Change-Id: Ic93f7322aa35c06dd98df2b70c9f24f94a62467c
(cherry picked from commit b2418c74172364f875a08844fd7bb103a849a973)
 2025-08-24 23:18:11 +08:00
hang.xu
5d70958c55 FIX: the order of cans in AMSLite 
jira: STUDIO-7765, STUDIO-7766, STUDIO-7767, STUDIO-7721, STUDIO-7713

Change-Id: If95e0667fc1d615c0494b007f7f7408f68e5b21c
(cherry picked from commit 9b510c0aeb4e9b8f26c285e1f6d5402852be1895)
 2025-08-24 23:18:10 +08:00
hang.xu
53a1827731 FIX: Ams control display 
jira: NONE

Change-Id: I221eb4167dad894c9e7f32141d33c5c96934df96
(cherry picked from commit 065c8d029eb9df4deb85ce22fe41896fa7c2a883)
 2025-08-24 23:18:09 +08:00
tao wang
b46b69ebad NEW:support new ext slot mapping 
jira:[support new mapping]

Change-Id: Iaf88f7bd57177df772a926ad162bd3b5a141327a
(cherry picked from commit 3b93bd2dd305026457e9f63ca3faeb153b59c9a5)
 2025-08-24 23:18:00 +08:00
Noisyfox
d60fcb0d11 Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
 2025-06-21 10:27:10 +08:00
yw4z
8aec3f69e5
Remove usage of titlebar icons (#9932)
Some checks are pending
Build all / Build All (push) Waiting to run
Details
Build all / Flatpak (push) Waiting to run
Details 
* ibit

* update

* Update RecenterDialog.cpp

* Update AboutDialog.cpp
 2025-06-20 16:52:15 +08:00
Noisyfox
043abb4389
Merge branch 'main' into dev/bbl-network-upd 2025-06-16 14:02:04 +08:00
Alexandre Folle de Menezes
e13ec786d5
Fix english strings punctuation mistakes (#8901)
Some checks failed
Build all / Build All (push) Waiting to run
Details
Build all / Flatpak (push) Waiting to run
Details
Publish docs to Wiki / Publish docs to Wiki (push) Has been cancelled
Details 
* Fix punctuation of enumerations

* Add missing '?' at the end of questions on hints

* Add periods after error messages

* Add punctuation to all tooltips

* Add missing periods on the pt-BR translation
 2025-06-15 16:12:03 +08:00
Noisyfox
c72e8a24f1 Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
 2025-06-15 15:28:10 +08:00
Dipl.-Ing. Raoul Rubien, BSc
3ecca6116d
fixes compiler warnings (#9619) 
* compiler warnings: adds SYSTEM to [target_]include_directories to skip warnings originating from dependencies

* compiler warnings: uninitialized/unused variables, missing parenthesis, pragma

* compiler warnings: redundant template type, missing curly braces, pass 0 instead of NULL as int argument

* compiler warnings: removes fclose(fp) where fp==nullptr since fclose() has attribute __nonnull((1))

* compiler warnings: uninitialized variables, missing parentheses, missing curly braces

* compiler warnings: ? as lower precedence than <<

* compiler warnings: unused variable

* compiler warnings: unused result

* compiler warnings: undefined/unused variable

* compiler warnings: uninitialized variable
 2025-06-14 21:05:25 +08:00
tao wang
e8f5b374b2 ENH:support u0 firmware homing 
jira:[none]

Change-Id: I9533944c343007897d25929739e5eb175bad6689
(cherry picked from commit 533911e2cd46fadc92bd7d908e81ad51ce14944c)
 2025-06-01 23:39:42 +08:00
tao wang
50fe1f7312 NEW:use new homing command 
jira:[none]

Change-Id: I9d60d0b5c2d0e2cf7ac5c5e4b0dbcf2daf6edbb1
(cherry picked from commit 9dce95d401e8333077db63dbad57bda837d0ce19)
 2025-06-01 23:38:27 +08:00
Noisyfox
9444d61bb6
Merge branch 'main' into dev/bbl-network-upd 2025-06-01 19:33:39 +08:00
Alexandre Folle de Menezes
b8c5ddd0ee
Fix the spelling/grammar on the original english strings (#9487) 
* Fix the spelling/grammar on english strings

* Fix the spelling/grammar on english strings, part 2
 2025-06-01 19:32:36 +08:00
tao wang
54748aee1c ENH:Support more SD card states 
jira:[for sdcard]

Change-Id: Ic09198a0ed357f827768ed2f8d8a9ed6266f749f
(cherry picked from commit c877405caba2b75c515c814b7aaa0793200eee04)
 2025-05-26 14:41:43 +08:00
zhimin.zeng
d613662ef7 FIX: Calibration adaptation encryption 
jira: none
Change-Id: Ie42da224ca02261b0c32262be895c215878b7921
(cherry picked from commit 7498d6e5f89751d4f576ba073485238baba53d0f)
 2025-05-25 20:29:53 +08:00
Noisyfox
65936b34c1 Fix crash when using old firmware 2025-05-24 18:37:35 +08:00
Noisyfox
625a946e25 FIX:update load/unload command for n3s 
(cherry picked from commit bambulab/BambuStudio@fc32042639)

---------

Co-authored-by: tao wang <tao.wang@bambulab.com>
 2025-05-22 21:54:15 +08:00
Noisyfox
e3ffc39316 Display correct AMS type 2025-05-19 23:10:16 +08:00
Noisyfox
80b234a369 Preparing for AMS drying support 2025-05-19 11:04:14 +08:00
Noisyfox
05a0703120 Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
 2025-05-17 00:22:09 +08:00
Alexandre Folle de Menezes
57a6f61349
Fix the spacing on the original english strings (#9596) 
* Remove extra spaces between words

* Remove extra spaces after punctuation

* Remove extra spaces before punctuation

* Always needs a space after punctuation

* Always needs a space before parens

* Remove trailing spaces before newline
 2025-05-16 16:31:58 +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
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
Noisyfox
37244cce95 Update to latest BBS code. Fix ams filament preset check 2025-05-07 20:42:23 +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
108a5b8344 Update naming 2025-05-07 16:35:57 +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
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
Alexandre Folle de Menezes
d37f1b6a81
Fix english strings consistency (#8881) 
* "non zero" -> "non-zero"

* "Z hop" -> "Z-hop"

* "works" -> "is working"

* "version at least x" -> "version x or higher"

* "printing job" -> "print job"
"to print on" -> "printing on"

* "is not find" -> "was not found"

* "boundary of plate" -> "plate boundaries"

* "toolchange" -> "tool change"

* "colour" -> "color"

* "cancelled" -> "canceled"

* "can not" -> "cannot"

* "gcode" -> "G-code"
 2025-04-26 19:59:49 +08:00
tao wang
22613f498a FIX:display msg when cannot edit filament 
jira:[edit filament]

Change-Id: I7e2b4fabeb3930f34fc252f1334e168e4f623b77
(cherry picked from commit 95655e067a7187afd29e53759aae8e3023a5a7f7)
 2025-01-23 11:38:16 +08:00
Kunlong Ma
b75f22bb22 ENH: Optimize the presentation of error code dialog 
JIRA: STUDIO-7469 STUDIO-7477 STUDIO-7613

Change-Id: I6689dc375a51a1d690b82f9dbaa79d1555f7816f
(cherry picked from commit 777c16fef0862587f3ec468652aabd70cff88dfe)
 2025-01-23 10:00:48 +08:00
Henri van der Riet
5b0ddbd5f7 merge conflicts 2024-09-08 01:04:19 +02:00