rc for 2.5.60.1

.github/CODEOWNERS

@@ -1,3 +1,3 @@
-*  @lordofhyphens @supermerill
+*  @supermerill @lordofhyphens
 
-.github/CODEOWNERS @lordofhyphens
+.github/CODEOWNERS @supermerill

.github/CONTRIBUTING.md

@@ -1,36 +1,23 @@
 # CONTRIBUTING
 
-## Bug Reports
+* SuperSlicer and Slic3r are merging so you should be able to use the superslicer repository or the slic3r one. (when the switch will be completed)
 
-Did you encounter an issue with using Slic3r? Fear not! This guide will help you to write a good bug report in just a few, simple steps.
+## Bug Reports
 
-There is a good chance that the issue, you have encountered, is already reported. Please check the [list of reported issues](https://github.com/alexrj/Slic3r/issues) before creating a new issue report. If you find an existing issue report, feel free to add further information to that report.
+Did you encounter an issue with using SuperSlicer? Fear not! This guide will help you to write a good bug report in just a few, simple steps.
 
-If you are reporting an issue relating to a release version of Slic3r, it would help a lot if you could also confirm that the behavior is still present in the newest build [(windows)](https://bintray.com/lordofhyphens/Slic3r/slic3r_dev/). Otherwise your issue will be closed as soon as someone else isn't able to reproduce it on current master.
+There is a good chance that the issue, you have encountered, is already reported. Please check the [list of reported issues](https://github.com/supermerill/SuperSlicer/issues) before creating a new issue report. If you find an existing issue report, feel free to add further information to that report.
 
-When possible, please include the following information when [reporting an issue](https://github.com/Slic3r/Slic3r/issues/new):
-* Slic3r version (See the about dialog for the version number. If running from git, please include the git commit ID from `git rev-parse HEAD` also.)
-* Operating system type + version
-* Steps to reproduce the issue, including:
-    * Command line parameters used, if any
-    * Slic3r configuration file (Use ``Export Config...`` from the ``File`` menu - please don't export a bundle)
-    * Expected result
-    * Actual result
-    * Any error messages
-* If the issue is related to G-code generation, please include the following:
-    * STL, OBJ or AMF input file (please make sure the input file is not broken, e.g. non-manifold, before reporting a bug)
-    * a screenshot of the G-code layer with the issue (e.g. using [Pronterface](https://github.com/kliment/Printrun) or preferably the internal preview tab in Slic3r).
-* If the issue is a request for a new feature, be ready to explain why you think it's needed.
-    * Doing more preparatory work on your end makes it more likely it'll get done. This includes the "how" it can be done in addition to the "what". 
-    * Define the "What" as strictly as you can. Consider what might happen with different infills than simple rectilinear.
+If you are reporting an issue relating to a release version of SuperSlicer, it would help a lot if you could also confirm that the behavior is still present in the [newest build](https://github.com/supermerill/SuperSlicer/actions).
 
+Please include the needed information when [reporting an issue](https://github.com/supermerill/SuperSlicer/issues/new) (follow the template and add your project file!)
 Please make sure only to include one issue per report. If you encounter multiple, unrelated issues, please report them as such.
 
 Simon Tatham has written an excellent on article on [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) which is well worth reading, although it is not specific to Slic3r.
 
 ## Submitting a Patch
 
-Do you want to help fix issues in or add features to Slic3r? That's also very, very welcome :)
+Do you want to help fix issues in or add features to SuperSlicer/Slic3r? That's also very, very welcome :)
 
 Basically you can follow the [GitHub
 flow](https://guides.github.com/introduction/flow/) for submitting
@@ -57,6 +44,5 @@ contributing to the Slic3r project.
 
 ## Communication
 
+* [Superslicer discord invite link](https://discord.gg/ygBBdRRwJY)
 * #slic3r on [FreeNode](https://webchat.freenode.net): talk to _Sound_, _LoH_ or the other members of the Slic3r community.
-* Drop Alessandro a line at [email protected].
-* Drop Joseph a line at [email protected]

.github/FUNDING.yml

@@ -1,6 +1,7 @@
 # These are supported funding model platforms
 
 github: [supermerill]# Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+ko_fi: superslicer
 #patreon: # Replace with a single Patreon username
 #open_collective: # Replace with a single Open Collective username
 #ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE.md

@@ -1,26 +1,19 @@
 ### Version
-_Version of Slic3r used goes here_
-
-_Use `About->About Slic3r` for release versions._
-
-_Do not report Prusa3D Slic3r bugs here without confirming it is a problem on a development release of Slic3r, or your issue will be closed. *Only* use normal Slic3r version IDs._
-
-_For -dev versions, use `git describe --tag` or get the hash value for the version you downloaded or `git rev-parse HEAD`_
+_Version of SuperSlicer used goes here (help->about)_
 
 ### Operating system type + version
 _What OS are you using, and state any version #s_
 
 ### Behavior
 * _Describe the problem_
 * _Steps needed to reproduce the problem_
-  * _If this is a command-line slicing issue, include the options used_
 * _Expected Results_
 * _Actual Results_
-  * _Screenshots from __*Slic3r*__ preview are preferred_
+  * _Screenshots if useful_
 
 _Is this a new feature request?_
 Related guides for writing feature requests: http://meta.stackexchange.com/a/259196 http://nickohrn.com/2013/09/write-great-feature-request-bug-report/
 
-
-#### STL/Config (.ZIP) where problem occurs
-_Upload a zipped copy of an STL and your config (`File -> Export Config`)_
+#### Project File (.3MF) where problem occurs
+_*Upload a Project File* (.3MF) `Plater -> Save Project as...`_
+_You have to zip it (or rename it to .zip) to be able to drag& drop it here_

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +1,33 @@
 ---
-name: Bug report
-about: Create a report to help us improve
+name: Bug report template
+about: Old bug report template do modify manually
 
 ---
 
-### Do not report Prusa3D Slic3r bugs here without confirming it is a problem on a development release of Slic3r, or your issue will be closed. [Development builds of Slic3r](https://dl.slic3r.org/dev). [Prusa3D Issue Tracker](https://github.com/Prusa3D/Slic3r/issues)
-
-**Describe the bug**
+**Bug description**
 A clear and concise description of what the bug is.
 
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+!!>> Project File <<!!
+*Please* upload a ZIP archive containing the project file used when the problem arise: `File`->`Save project as...`, then zip it & drop it here.  
+Please export it just before the problem occur. Even if you did nothing and/or there is no object, export it! (it contains your current configuration).
+
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**3D Model and Slic3r Configuration Export**
-Please upload a ZIP archive containing a copy of the 3D model you are seeing this bug with and a CTRL-E export of the configuration used.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. MacOS, Linux, Windows]
- - Version [e.g. 1.3.0]
-     - _Do not report Prusa3D Slic3r bugs here without confirming it is a problem on a development release of Slic3r, or your issue will be closed. *Only* use normal Slic3r version IDs._
-     - _For -dev versions, use `git describe --tag` or get the hash value for the version you downloaded or `git rev-parse HEAD`_
-     - _Use `About->About Slic3r` for release versions._
+ - Version [e.g. 2.3.55.5], Use `Help->About`_
+ - Printer model
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report_form.yml

@@ -0,0 +1,56 @@
+name: Bug Report
+description: File a bug report
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: |
+        What is the problem?
+        What did you expect?
+        You paste or drop screenshots here 
+    validations:
+      required: true
+  - type: textarea
+    id: to_reproduce
+    attributes:
+      label: Project file & How to reproduce
+      description: "*Please* upload a ZIP archive containing the project file used when the problem arise. Please export it just before the problem occur. Even if you did nothing and/or there is no object, export it! (it contains your current configuration)."
+      placeholder: |
+        `File`->`Save project as...` then zip it & drop it here
+        Also, if needed include the steps to reproduce the bug:
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running? You can have the full version in `Help` -> `About superslicer`.
+      placeholder: 2.4.60.2
+    validations:
+      required: false
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: with the version if possible
+      placeholder: windows 10 / ubuntu 22.04 / macos 15
+    validations:
+      required: false
+  - type: input
+    id: printer
+    attributes:
+      label: Printer model
+      description: May be useful to update default profile, or understand why to creates a problem
+      placeholder: voron 2.4 with afterburner
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,16 +4,17 @@ about: Suggest an idea for this project
 
 ---
 
-### Do not request features for the Prusa3D fork of Slic3r here without confirming it is applicable to the mainline Slic3r, or your issue will be closed. [Development builds of Slic3r](https://dl.slic3r.org/dev). [Prusa3D Issue Tracker](https://github.com/Prusa3D/Slic3r/issues)
-
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
+**Describe how it would work**
+Be as descriptive as your skill level allows you.
+
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context or paint drawing about the feature request here.

.github/workflows/ccpp_mac.yml

@@ -11,19 +11,27 @@ on:
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v3
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -i
+      run: ./BuildMacOS.sh
+    - name: copy zstd
+      run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib
+    - name: relink zstd
+      run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib  @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }}
+    - name: create the dmg
+      run: |
+        hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder "build/pack/${{ github.event.repository.name }}" temp.dmg
+        hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: Upload artifact
       uses: actions/[email protected]
       with:
-        name: nightly_macos.tar
-        path: build/${{ github.event.repository.name }}.tar
+        name: nightly_macos.app
+        path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app
     - name: Upload artifact
       uses: actions/[email protected]
       with:
         name: nightly_macos.dmg
-        path: build/${{ github.event.repository.name }}.dmg
+        path: ${{ github.event.repository.name }}.dmg

.github/workflows/ccpp_mac_debug.yml

@@ -8,14 +8,22 @@ on:
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v2
       with:
         ref: 'debug_macos'
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -bi
+      run: ./BuildMacOS.sh -b
+    - name: copy zstd
+      run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib
+    - name: relink zstd
+      run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib  @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }}
+    - name: create the dmg
+      run: |
+        hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder build/pack/${{ github.event.repository.name }} temp.dmg
+        hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: tar the pack
       working-directory: ./build
       run: ls
@@ -28,4 +36,4 @@ jobs:
       uses: actions/[email protected]
       with:
         name: nightly_macos.tar
-        path: build/${{ github.event.repository.name }}.tar
+        path: ${{ github.event.repository.name }}.tar

.github/workflows/ccpp_mac_rc.yml

@@ -4,25 +4,32 @@ on:
   push:
     branches:
       - rc
+      - debug_macos
 
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: 'rc'
+    - uses: actions/checkout@v3
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -i
+      run: ./BuildMacOS.sh
+    - name: copy zstd
+      run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib
+    - name: relink zstd
+      run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib  @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }}
+    - name: create the dmg
+      run: |
+        hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder "build/pack/${{ github.event.repository.name }}" temp.dmg
+        hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: Upload artifact
       uses: actions/[email protected]
       with:
-        name: rc_macos.tar
-        path: build/${{ github.event.repository.name }}.tar
+        name: rc_macos.app
+        path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app
     - name: Upload artifact
       uses: actions/[email protected]
       with:
         name: rc_macos.dmg
-        path: build/${{ github.event.repository.name }}.dmg
+        path: ${{ github.event.repository.name }}.dmg

.gitignore

@@ -18,5 +18,7 @@ local-lib
 build*
 deps/build*
 deps/deps-*
-**/.DS_Store
+
+# MacOS Ignores
+.DS_Store