3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-05 04:54:08 -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/GUI/Jobs/ArrangeJob.cpp
View file

@ -237,7 +237,7 @@ void ArrangeJob::prepare_all() {
if (m_selected.empty()) {
if (!selected_is_locked) {
m_plater->get_notification_manager()->push_notification(NotificationType::BBLPlateInfo,
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("No arrangable objects are selected.")));
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("No arrangeable objects are selected.")));
}
else {
m_plater->get_notification_manager()->push_notification(NotificationType::BBLPlateInfo,

2
src/slic3r/GUI/Jobs/PlaterWorker.hpp
View file

@ -88,7 +88,7 @@ class PlaterWorker: public Worker {
if (eptr) try {
std::rethrow_exception(eptr);
} catch (std::exception &e) {
show_error(m_plater, _L("An unexpected error occured") + ": " + e.what());
show_error(m_plater, _L("An unexpected error occurred") + ": " + e.what());
eptr = nullptr;
}
}