3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-16 01:19:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'main' into dev/p2s-pr

Browse source 
# Conflicts:
#	src/slic3r/GUI/DeviceErrorDialog.cpp
This commit is contained in:
Noisyfox 2025-11-09 12:35:32 +08:00
commit 614612ed38
48 changed files with 3533 additions and 3528 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/SendSystemInfoDialog.cpp
View file

@ -728,7 +728,7 @@ bool SendSystemInfoDialog::send_info(wxString& message)
if (job_done) // UI thread wants us to cancel.
cancel = true;
if (cancel)
//result = { Result::Cancelled, _L("Sending system info was cancelled.") };
//result = { Result::Cancelled, _L("Sending system info was canceled.") };
result = {Result::Cancelled, wxEmptyString};
})
.perform_sync();