Merge branch 'master' into dev

This commit is contained in:
Lukas Matena 2022-02-01 14:17:34 +01:00
commit cb5ff10a88
12 changed files with 105 additions and 66 deletions
src/slic3r/GUI

View file

@ -871,8 +871,8 @@ void GUI_App::init_app_config()
{
// Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release.
// SetAppName(SLIC3R_APP_KEY);
SetAppName(SLIC3R_APP_KEY "-alpha");
// SetAppName(SLIC3R_APP_KEY "-beta");
// SetAppName(SLIC3R_APP_KEY "-alpha");
SetAppName(SLIC3R_APP_KEY "-beta");
// SetAppDisplayName(SLIC3R_APP_NAME);
// Set the Slic3r data directory at the Slic3r XS module.