viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'main' into dev/bbl-network-upd

Browse Source 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
This commit is contained in:
Noisyfox
2025-05-17 00:22:09 +08:00
parent eb8a4419c2 ae1c8f1d6a
commit bd34ae53b4
538 changed files with 40311 additions and 4069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/Plater.cpp
View File

@@ -3224,12 +3224,12 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
notification_manager->close_notification_of_type(NotificationType::ExportFinished);
notification_manager->push_notification(NotificationType::CustomNotification,
NotificationManager::NotificationLevel::RegularNotificationLevel,
format(_L("Successfully unmounted. The device %s(%s) can now be safely removed from the computer."), evt.data.first.name, evt.data.first.path)
format(_L("Successfully unmounted. The device %s (%s) can now be safely removed from the computer."), evt.data.first.name, evt.data.first.path)
);
} else {
notification_manager->push_notification(NotificationType::CustomNotification,
NotificationManager::NotificationLevel::ErrorNotificationLevel,
format(_L("Ejecting of device %s(%s) has failed."), evt.data.first.name, evt.data.first.path)
format(_L("Ejecting of device %s (%s) has failed."), evt.data.first.name, evt.data.first.path)
);
}
});
@@ -9290,7 +9290,7 @@ void Plater::import_model_id(wxString download_info)
}
msg = _L("downloading project ...");
msg = _L("downloading project...");
//target_path = wxStandardPaths::Get().GetTempDir().utf8_str().data();
@@ -14635,7 +14635,7 @@ void Plater::post_process_string_object_exception(StringObjectException &err)
break;
}
}
err.string = format(_L("Plate %d: %s is not suggested to be used to print filament %s(%s). "
err.string = format(_L("Plate %d: %s is not suggested to be used to print filament %s (%s). "
"If you still want to do this print job, please set this filament's bed temperature to non-zero."),
err.params[0], err.params[1], err.params[2], filament_name);
err.string += "\n";