Merge branch 'main' into harktech/k2-discovery

This commit is contained in:
SoftFever
2026-05-21 11:43:52 +08:00
committed by GitHub
437 changed files with 7471 additions and 3381 deletions

View File

@@ -14904,7 +14904,8 @@ void Plater::export_gcode(bool prefer_removable)
unsigned int state = this->p->update_restart_background_process(false, false);
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return;
default_output_file = this->p->background_process.output_filepath_for_project("");
default_output_file = this->p->background_process.output_filepath_for_project(
into_path(this->p->get_project_filename(".3mf")));
} catch (const Slic3r::PlaceholderParserError &ex) {
// Show the error with monospaced font.
show_error(this, ex.what(), true);
@@ -15007,7 +15008,8 @@ void Plater::export_gcode_3mf(bool export_all)
unsigned int state = this->p->update_restart_background_process(false, false);
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return;
default_output_file = this->p->background_process.output_filepath_for_project("");
default_output_file = this->p->background_process.output_filepath_for_project(
into_path(this->p->get_project_filename(".3mf")));
}
catch (const Slic3r::PlaceholderParserError& ex) {
// Show the error with monospaced font.
@@ -16154,7 +16156,8 @@ void Plater::send_gcode_legacy(int plate_idx, Export3mfProgressFn proFn, bool us
unsigned int state = this->p->update_restart_background_process(false, false);
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return;
default_output_file = this->p->background_process.output_filepath_for_project("");
default_output_file = this->p->background_process.output_filepath_for_project(
into_path(this->p->get_project_filename(".3mf")));
} catch (const Slic3r::PlaceholderParserError& ex) {
// Show the error with monospaced font.
show_error(this, ex.what(), true);