3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 06:57:36 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

merge conflicts

Browse source
This commit is contained in:
Henri van der Riet 2024-09-02 21:21:20 +02:00
parent e750727743
commit 5b0ddbd5f7
44 changed files with 492 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/Utils/MKS.cpp
View file

@ -84,7 +84,7 @@ bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn er
int err_code = get_err_code_from_body(body);
if (err_code != 0) {
BOOST_LOG_TRIVIAL(error) << boost::format("MKS: Request completed but error code was received: %1%") % err_code;
error_fn(format_error(body, L("Unknown error occured"), 0));
error_fn(format_error(body, L("Unknown error occurred"), 0));
res = false;
}
else if (upload_data.post_action == PrintHostPostUploadAction::StartPrint) {