merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
parent e745ac980e
commit 9f91a8450b
156 changed files with 33597 additions and 65667 deletions
--- a/src/slic3r/GUI/SelectMachine.hpp
+++ b/src/slic3r/GUI/SelectMachine.hpp
@@ -260,6 +260,7 @@ enum PrintDialogStatus {
    PrintStatusNeedForceUpgrading,
    PrintStatusNeedConsistencyUpgrading,
    PrintStatusNotSupportedSendToSDCard,
+    PrintStatusNotSupportedPrintAll,
    PrintStatusBlankPlate
 };