juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-18 00:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,267 Commits 24 Branches 82 Tags
2486bdfbcee2285c22a04ca28f3bb63aca0595be
Commit Graph

189 Commits

Author SHA1 Message Date
Kiss Lorand
ace2bd1349 FIX: Embossed text edit not reflected in Objects list (#11692) 
Fix object list name refresh after emboss edits

Refresh the object list immediately after embossed text name changes so the displayed name stays in sync.
 2025-12-22 18:23:41 +02:00
yw4z
380ea7e2e8 Fix fill bed and disable arranging after adding / removing instances (#11619) 2025-12-19 08:32:14 +00:00
Noisyfox
614612ed38 Merge branch 'main' into dev/p2s-pr 
# Conflicts:
#	src/slic3r/GUI/DeviceErrorDialog.cpp
 2025-11-09 12:35:32 +08:00
Alexandre Folle de Menezes
14dd1078bf Spellcheck translatable strings (#11242) 
* Spellcheck translatable strings
 2025-11-09 11:52:27 +08:00
Noisyfox
00122a9de5 Merge branch 'main' into dev/p2s-pr 
# Conflicts:
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/Utils/CalibUtils.cpp
 2025-10-29 21:03:22 +08:00
Seref
4b7b81a0a2 Add setting to enable uploads to abnormal Storage; improve sd_card_state error reporting (#10981) 
* Add option to allow upload to SD-Cards marked as abnormal, also add better error description

+ Adds the options under the Network Settings to allow upload to abnormal SD-Card.
+ If not enabled user will now see why the upload is stuck at 10% depending on the sd_card_state (Readonly/Abnormal)

* Merging with current branch, and updateing "sd-card" to "storage"

* Generate localization and also change remaining sd_card_abnormal states to _storage_abnormal

* Fix issues from merge, and other bugfixes.

* Regenerate localization files.

* Improve Missing Storage Message, Add skip for abnormal storage in printer select dialog
 2025-10-29 20:32:38 +08:00
haolin.tian
62bf7d1355 FIX: pass try_emmc_print flag when print 
jira: [STUDIO-14427]
Change-Id: I3b765e4ea3f290bbc95616f07b416a72f60c7bc5
(cherry picked from commit 39aa7ede7f4cfee20db8f6040a17317a72c9c95e)
 2025-10-28 15:29:57 +08:00
haolin.tian
aa75c444aa NEW: print with emmc 
jira: [STUDIO-14427]
Change-Id: I8b0c56ce1c2b7b90949b72c49acfdbb31c876df1
(cherry picked from commit 76e45bde2540ee418719e00b999c5fd724baec71)
 2025-10-28 15:29:57 +08:00
xin.zhang
934f32bd8c FIX: remove some warnings 
jira: [none]
Change-Id: I0e74b7316d0efe38c65e1f695b2a09eb09103552
(cherry picked from commit 766c6e004145325bcc7a6addfce27842ee9504de)
 2025-10-28 15:29:56 +08:00
tao wang
a40f3ed85f NEW:support nozzle mapping 
Change-Id: I1b9e906d99bc7a3172dc31976422f67e08cfdcd3
(cherry picked from commit 24fcf7d25c54e571627ce3383888e5d4deb01851)
 2025-10-28 15:29:53 +08:00
Vovodroid
e922411371 Add instances (#6237) 
* Add instances

* - Added a new menu item for converting instances to objects,

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2025-10-26 16:13:14 +08:00
shan.chang
bd066e7f96 ENH: add new arrangement features for wrapping detection area 
Jira: STUDIO-13735

Change-Id: I198d19f5e6ef70f0adfa6370269290c81d21a557
(cherry picked from commit dc83637652526111611d0833d5f5798aaa3e7be7)
 2025-10-02 17:41:41 +08:00
milk
2dde924582 FIX:change name from SD card print 
jira:[STUDIO-13733]

Change-Id: I017268520f522773decf68be701c9faa819af8b8
(cherry picked from commit ba16e21702719084d8af2bb8fe88fde290d5763b)
 2025-10-02 17:07:21 +08:00
xin.zhang
4a787f6ff8 ENH: clean codes about device 
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
 2025-10-02 09:30:48 +08:00
Noisyfox
8611125008 Change the worker to store the job using shared_ptr, so caller can still hold a reference to the job for other purpose 2025-09-29 23:15:15 +08:00
hemai
a7ad18e66e ENH: support multi-color with external 
Jira: [STUDIO-12520]
Change-Id: I34c88b6a84514a0e56e65723f91d1a2940128e8d
(cherry picked from commit b8879ec648e038080628190fc363251229bbd5ee)
 2025-09-28 17:13:54 +08:00
hemai
527def0887 FIX: limit long model_name from makerworld 
Jira: STUDIO-12553

Change-Id: I4d43d2b3abbb392baad2ae72d4197a6e61ab3f51
(cherry picked from commit fd0f7688508c0ff2a420bff34beae280cc24cf2b)
 2025-09-25 17:18:06 +08:00
tao wang
faa1b2df6d ENH:fixed the issue of cant send SD card printing in LAN mode 
jira:[STUDIO-11944]

Change-Id: Iab0b2db690e5cf8e02be5c6bf1bcf94a4e0b5468
(cherry picked from commit 60dd53b26dd30de5ea07d83de19832a089655835)
 2025-09-23 16:38:51 +08:00
milk
7c28b5ae52 ENH:After re-importing the multi-plate Gcode.3mf file, sending all plates to the printer results in information loss 
jira: [STUDIO-11531]

Change-Id: Icfbf56ac1f6610f70c3ed192f765e3381ad8ddb6
(cherry picked from commit fcb4ca7a412dfc7c0897b96a3b4c528e6936c297)
 2025-09-23 09:22:53 +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
6f2f8c584e ENH: wipe_tower: use uniform wipe tower logic for cli and gui 
jira: no-jira
Change-Id: I179212585871071cd17bd37c2756444a2d7aba1f
(cherry picked from commit 1f3dde94980d3685bb4d1266e8a5448b8f231b9f)
 2025-09-17 23:29:14 +08:00
zhou.xu
9c10278fe8 FIX:The extruder index defaults from 1 
jira: github 5916
Change-Id: Icae2c4c272b80de8055cc3aeb91584df621fc436
(cherry picked from commit 0b24359f5953ed734e6f6eea61a42b67d02af82e)
 2025-09-16 20:10:39 +08:00
xin.zhang
9e024d1d4d FIX: the json val could be long long or string 
jira: [none]
Change-Id: Ic06276adf5e7663d57ba1c4b6f9a57e897a9075d
(cherry picked from commit edaaa0b70523951aaa0d415ab178a438a7d7b377)
 2025-09-13 19:11:58 +08:00
xin.zhang
2cbf14fdfd FIX: update HMS to support multi-type machines 
jira: [STUDIO-9582]
Change-Id: I5ad4083d666db4237d355ac8bd8160afb8e8a35f
(cherry picked from commit 954a27016953bcf4f07b2a3e14ac1f5faf68c644)
 2025-09-09 10:46:37 +08:00
tao wang
a88beb02d1 ENH:change SD card to external storage 
jira:[none ]

Change-Id: Ia8fb38151f75433344a085196728752d2fe6f159
(cherry picked from commit 6c7b61fcd8aefd9ad9da56da8b55e0c06865a677)
 2025-09-05 19:48:50 +08:00
Alexandre Folle de Menezes
4cab501f14 Fix inconsistencies on new translated strings (#10310) 
* Unmark string that don't need to be translated

* Spellcheck

* Fix calibration strings consistency
 2025-08-09 23:52:48 +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
Alexandre Folle de Menezes
a2f87dc980 Fix casing issues on the original english strings (#9513) 
* Use lowercase after comma

* Use uppercase after period
 2025-06-01 19:31:55 +08:00
Noisyfox
3d64af917a Merge branch 'main' into dev/bbl-network-upd 2025-06-01 19:25:21 +08:00
Noisyfox
4ae4634976 Fix tree support bed exclusion area calculation (#9633) 
Fix tree support bed exclusion area calculation (SoftFever/OrcaSlicer#9624)
 2025-06-01 13:18:03 +08:00
Noisyfox
1c58c933e2 Add missing print params 2025-05-14 20:39:27 +08:00
tao wang
7fe421b1b3 ENH:support new amsmapping data 
jira:[for 2 extruder]

Change-Id: Ie03eae17d600bc68451511a0179f20d1919ff6ea
(cherry picked from commit 0848c26da97c7b74e98645b9a0873fe928fdf631)
 2025-05-01 15:54:18 +08:00
Alexandre Folle de Menezes
7d72db562f Add translation markers on more unstranslated strings (#9134) 2025-04-26 23:11:36 +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
Noisyfox
a359c05b8d FIX:filter the characters of model names in the model mall (#8407) 
jira:[STUDIO-6649]
If the model comes from model mall, the name from the mall will be used when sending and printing. When there are special characters in the name, it will cause the sending to fail.

Change-Id: I324441cc7177e7062b79280c5d23afe9eeb5e4c2
(cherry picked from commit 1bcf30c39c648763952703c9060573baa2782f87)

Co-authored-by: tao wang <tao.wang@bambulab.com>
 2025-02-15 12:31:41 +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
Noisyfox
cef15842bb Fix arrange when print-by-object and have object off-plate (#8038) 
* Fix arrange when print-by-object and have object off-plate (SoftFever/OrcaSlicer#7745)
Partly revert 0b6a1d3636

* Fix issue that fill bed with instance ignores print-by-object clearance (SoftFever/OrcaSlicer#5153)
 2025-01-22 10:03:21 +08:00
Noisyfox
22dc0b1212 Update Emboss font preview alignment (#8013) 
* Fix style preview size per resolution

(cherry picked from commit b67c4785f0d300b5615126ea1df1d518dd6d00b0)

* Align font preview to left. (closer to font name)

(cherry picked from commit eb9b8c0c2b112f0f7649e58f4f6d7977380b8442)

---------

Co-authored-by: Filip Sykala - NTB T15p <Filip.Sykala@Prusa3D.cz>
 2025-01-22 10:01:54 +08:00
Marius Wachtler
2b95ef4e3b Fix some errors uncovered via compiler warnings (#7954) 
* fix: tray_exist_bits != tray_exist_bits comparison

* fix: title == GetTitle() == title comparison

* fix: possibly dangling reference to a temporary
```
OrcaSlicer/src/libslic3r/calib.cpp:456:17: warning: possibly dangling reference to a temporary [-Wdangling-reference]
  456 |     const auto &w         = bed_ext.size().x();
OrcaSlicer/src/libslic3r/calib.cpp:456:45: note: the temporary was destroyed at the end of the full expression ‘((Eigen::DenseCoeffsBase<Eigen::Matrix<double, 2, 1, 2>, 1>*)(& Slic3r::BoundingBoxBase<PointClass>::size() const [with PointClass = Eigen::Matrix<double, 2, 1, 2>]()))->Eigen::DenseCoeffsBase<Eigen::Matrix<double, 2, 1, 2>, 1>::x()’
  456 |     const auto &w         = bed_ext.size().x();
```

* fix: mixup of | and ||
in this case I think it actually does not change the semantics it just means that both comparison have to be evaluated.

* fix: multi-character character constants need "

OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp:392: warning: multi-character character constant [-Wmultichar]
  392 |     if (auto n = tunnel.find_first_of('/_'); n != std::string::npos)
OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp: In member function ‘void Slic3r::GUI::MediaPlayCtrl::Stop(const wxString&)’:
OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp:392: warning: overflow in conversion from ‘int’ to ‘char’ changes value from ‘12127’ to ‘95’ [-Woverflow]

* fix: missing paranthesis - skips null check

* NFC: Remove this check it can never be false

* NFC: fix warning: statement has no effect
 2025-01-08 13:06:39 +08:00
SoftFever
30498ccb7b Fixed a regression bug that spacing was not working anymore when arrange plate objects (#6741) 
fix a regression bug in arrange
 2024-09-12 23:01:01 +08:00
Henri van der Riet
5b0ddbd5f7 merge conflicts 2024-09-08 01:04:19 +02:00
SoftFever
415bedef94 Enabling object skirt. (#6487) 
Implements individual object skirts, as requested in  **Individual skirts when printing by object. #3486** and  **Skirt around each object when using "by object" sequence #2652**

Now skirt type could be
![image](https://github.com/user-attachments/assets/532ecd91-fe3e-4bdb-b22f-ef28439ab7a6)

This PR based on several refactorings, including  **Configure skirt start point #6490** PR. To make review more easy each step was committed individually. Obviously them could be separated to different PRs or dropped.

I removed `prime_extruder && first_layer && extruder_id == first_extruder_id` as explicit object skirt is available.

Open question : do we need both common and object skirt together, probably with separate loop number?


All four combinations are possible.

Print by layer, common skirt:
![image](https://github.com/user-attachments/assets/5509f10b-ed3b-4243-8763-7ddcb101c67a)

Print by layer, object skirt:
![image](https://github.com/user-attachments/assets/deca3ca6-8bf7-4e5b-a356-2f5dd6e81566)

Print by object , object skirt:
![image](https://github.com/user-attachments/assets/7d1b2ddc-e61f-4d77-9ed4-e33fdd62d290)

Print by object , common skirt (any meaning?):
![image](https://github.com/user-attachments/assets/e7883eb4-b1a3-4158-a7f4-ce0658bc1939)
 2024-09-07 23:46:54 +08:00
SoftFever
220213e846 Revert "Fix typos and grammar (#6638)" 
This reverts commit 1afc1372bc.
 2024-09-07 20:04:17 +08:00
Vovodroid
07d79376d3 Warnings: remove empty code (#6577) 
* Warnings: remove empty code
 2024-09-07 18:18:35 +08:00
Vovodroid
044a1c4fc5 Warnings: various fixes (#6582) 
* Warnings: various fixes

* Use std::ignore
 2024-09-07 18:16:50 +08:00
henrivdr
1afc1372bc Fix typos and grammar (#6638) 
* fix lots of typos, grammar etc.

* merge conflict

* merge conflict

* merge conflict

* merge conflict

* revert gettext comments

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2024-09-07 18:00:01 +08:00
SoftFever
5b5cd478c2 Merge branch 'main' into skirt-object-fix-pr 2024-09-07 10:57:59 +08:00
vovodroid
2a8b39acd4 Object skirt 2024-08-26 13:48:51 +03:00
vovodroid
0b6a1d3636 Refactor all_objects_are_short 2024-08-24 15:37:47 +03:00