Sync to 2.4.1-beta1

2022-02-01 14:16:13 +01:00 · 2022-02-01 14:16:13 +01:00 · 5c616c5931
commit 5c616c5931
parent ebb9041041
92 changed files with 920 additions and 45290 deletions
--- a/src/slic3r/Utils/PrintHost.cpp
+++ b/src/slic3r/Utils/PrintHost.cpp
@ -52,10 +52,7 @@ PrintHost* PrintHost::get_print_host(DynamicPrintConfig *config)
            case htAstroBox:  return new AstroBox(config);
            case htRepetier:  return new Repetier(config);
            case htPrusaLink: return new PrusaLink(config);
-<<<<<<< HEAD
-=======
            case htMKS:       return new MKS(config);
->>>>>>> master
            default:          return nullptr;
        }
    } else {