Merge branch 'master' into fs_QuadricEdgeCollapse

# Conflicts:
#	src/slic3r/GUI/NotificationManager.hpp
This commit is contained in:
Filip Sykala 2021-08-25 13:16:01 +02:00
commit 790d445420
33 changed files with 771 additions and 378 deletions

View file

@ -545,7 +545,6 @@ private:
NotificationType::PlaterWarning,
NotificationType::ProgressBar,
NotificationType::PrintHostUpload,
NotificationType::UpdatedItemsInfo,
NotificationType::SimplifySuggestion
};
//prepared (basic) notifications