juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-18 02:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/h2d

Browse Source 
# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp
This commit is contained in:
Noisyfox
2025-09-16 11:27:44 +08:00
parent e7e6405ad3 1e87666487
commit 2375ab860a
6267 changed files with 210560 additions and 178856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@@ -3547,7 +3547,7 @@ std::string ExportConfigsDialog::initial_file_name(const wxString &path, const s
}
catch(...) {
MessageDialog dlg(this,
wxString::Format(_L("The file: %s \nmay have been opened by another program. \nPlease close it and try again."),
wxString::Format(_L("The file: %s\nmay have been opened by another program.\nPlease close it and try again."),
encode_path(printer_export_path.string().c_str())),
wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES | wxYES_DEFAULT | wxCENTRE);
dlg.ShowModal();