Merge remote-tracking branch 'remote/master' into SoftFever

# Conflicts: # src/libslic3r/Preset.cpp
2022-09-09 21:54:57 +08:00
parent 25fed256ae 15ccd3661e
commit bb74438f7c
132 changed files with 5737 additions and 3598 deletions
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -130,13 +130,7 @@ void AppConfig::set_defaults()
 #endif

        if (get("single_instance").empty())
-            set_bool("single_instance",
-#ifdef __APPLE__
-                true
-#else // __APPLE__
-                false
-#endif // __APPLE__
-                );
+            set_bool("single_instance", false);

 #ifdef SUPPORT_REMEMBER_OUTPUT_PATH
        if (get("remember_output_path").empty())