2.4 nightly

.github/workflows/ccpp_mac.yml

@@ -4,16 +4,16 @@ on:
   push:
     branches:
       - Nigthly
+      - nightly_dev
+      - nightly_master
 
 jobs:
   build:
 
     runs-on: macos-10.15
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: 'Nigthly'
+    - uses: actions/checkout@v3
     - name: build deps & slicer
       run: ./BuildMacOS.sh -i
     - name: Upload artifact

.github/workflows/ccpp_mac_arm.yml

@@ -4,16 +4,16 @@ on:
   push:
     branches:
       - Nigthly
+      - nightly_dev
+      - nightly_master
 
 jobs:
   build:
 
     runs-on: macos-11
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: 'Nigthly'
+    - uses: actions/checkout@v3
     - name: build deps & slicer
       run: ./BuildMacOS.sh -ia
     - name: Upload artifact

.github/workflows/ccpp_ubuntu.yml

@@ -4,16 +4,16 @@ on:
   push:
     branches:
       - Nigthly
+      - nightly_dev
+      - nightly_master
 
 jobs:
   build:
 
     runs-on: ubuntu-18.04
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: 'Nigthly'
+    - uses: actions/checkout@v3
     - name: update submodule profiles
       working-directory: ./resources/profiles
       run: git submodule update --init

.github/workflows/ccpp_ubuntu_gtk3.yml

@@ -4,16 +4,16 @@ on:
   push:
     branches:
       - Nigthly
+      - nightly_dev
+      - nightly_master
 
 jobs:
   build:
 
     runs-on: ubuntu-18.04
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: 'Nigthly'
+    - uses: actions/checkout@v3
     - name: update submodule profiles
       working-directory: ./resources/profiles
       run: git submodule update --init

.github/workflows/ccpp_win.yml

@@ -4,15 +4,15 @@ on:
   push:
     branches:
       - Nigthly
+      - nightly_dev
+      - nightly_master
 
 jobs:
   build_dep:
     runs-on: windows-2019
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: 'Nigthly'
+    - uses: actions/checkout@v3
     - uses: ilammy/msvc-dev-cmd@v1
     - name: mkdir in deps
       run: mkdir deps/build

.github/workflows/ccpp_win_rc.yml

@@ -91,7 +91,9 @@ jobs:
     - name: copy new resources
       working-directory: ./build
       shell: cmd
-      run: xcopy /RCYIE ..\resources package\resources
+      run: |
+        xcopy /RCYIE ..\resources package\resources
+        del /S /Q package\resources\localization\*.so
     - name: copy dll & exe
       working-directory: ./build
       shell: cmd

build_win.bat

@@ -29,12 +29,12 @@
 @ECHO                  deps-dirty - build deps without cleaning
 @ECHO                Default: %PS_STEPS_DEFAULT%
 @ECHO  -r -RUN       Specifies what to perform at the run step:
-@ECHO                  console - run and wait on prusa-slicer-console.exe
+@ECHO                  console - run and wait on slic3r-console.exe
 @ECHO                  custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE%
 @ECHO                  ide - open project in Visual Studio if not open (no wait)
 @ECHO                  none - run step does nothing
-@ECHO                  viewer - run prusa-gcodeviewer.exe (no wait)
-@ECHO                  window - run prusa-slicer.exe (no wait)
+@ECHO                  viewer - run slic3r-gcodeviewer.exe (no wait)
+@ECHO                  window - run slic3r.exe (no wait)
 @ECHO                Default: none
 @ECHO  -d -DESTDIR   Deps destination directory
 @ECHO                Warning: Changing destdir path will not delete the old destdir.
@@ -56,7 +56,7 @@ GOTO :END
 REM Script constants
 SET START_TIME=%TIME%
 SET PS_START_DIR=%CD%
-SET PS_SOLUTION_NAME=PrusaSlicer
+SET PS_SOLUTION_NAME=Slic3r
 SET PS_CHOICE_TIMEOUT=30
 SET PS_CUSTOM_RUN_FILE=custom_run.bat
 SET PS_DEPS_PATH_FILE_NAME=.DEPS_PATH.txt
@@ -253,14 +253,14 @@ FOR /F "tokens=2 delims=," %%I in (
 @ECHO Running %PS_RUN% application...
 @REM icacls below is just a hack for file-not-found error handling
 IF "%PS_RUN%" EQU "console" (
-    icacls prusa-slicer-console.exe >nul || GOTO :END
-    start /wait /b prusa-slicer-console.exe
+    icacls slic3r-console.exe >nul || GOTO :END
+    start /wait /b slic3r-console.exe
 ) ELSE IF "%PS_RUN%" EQU "window" (
-    icacls prusa-slicer.exe >nul || GOTO :END
-    start prusa-slicer.exe
+    icacls slic3r.exe >nul || GOTO :END
+    start slic3r.exe
 ) ELSE IF "%PS_RUN%" EQU "viewer" (
-    icacls prusa-gcodeviewer.exe >nul || GOTO :END
-    start prusa-gcodeviewer.exe
+    icacls slic3r-gcodeviewer.exe >nul || GOTO :END
+    start slic3r-gcodeviewer.exe
 ) ELSE IF "%PS_RUN%" EQU "custom" (
     icacls %PS_CUSTOM_BAT% >nul || GOTO :END
     CALL %PS_CUSTOM_BAT%