Merge branch 'master' into fs_QuadricEdgeCollapse
# Conflicts: # src/slic3r/GUI/NotificationManager.hpp
This commit is contained in:
commit
790d445420
33 changed files with 771 additions and 378 deletions
src/slic3r/GUI
|
@ -545,7 +545,6 @@ private:
|
|||
NotificationType::PlaterWarning,
|
||||
NotificationType::ProgressBar,
|
||||
NotificationType::PrintHostUpload,
|
||||
NotificationType::UpdatedItemsInfo,
|
||||
NotificationType::SimplifySuggestion
|
||||
};
|
||||
//prepared (basic) notifications
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue