From 39c95d7fedac6a8504351bc9218f3f54fb663c54 Mon Sep 17 00:00:00 2001 From: remi durand Date: Sun, 4 Apr 2021 15:48:06 +0200 Subject: [PATCH] renaming for superslicer --- .github/CODEOWNERS | 4 +- .github/workflows/ccpp_mac.yml | 53 +++++------ .github/workflows/ccpp_ubuntu.yml | 27 +++--- .github/workflows/ccpp_win.yml | 11 ++- README.md | 140 +++++++++++++++++------------- version.inc | 20 ++--- 6 files changed, 140 insertions(+), 115 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 093f7d073b4..10b20b459a0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ -* @lordofhyphens @supermerill +* @supermerill @lordofhyphens -.github/CODEOWNERS @lordofhyphens +.github/CODEOWNERS @supermerill diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 8a62f81cd99..27f8f7a0b72 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -14,6 +14,9 @@ jobs: - uses: actions/checkout@v2 with: ref: 'CI' + - name: update submodule profiles + working-directory: ./resources/profiles + run: git submodule update - name: change date in version run: | sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc @@ -43,9 +46,9 @@ jobs: - name: cmake working-directory: ./build run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1 - - name: make Slic3r + - name: make SuperSlicer working-directory: ./build - run: make Slic3r + run: make SuperSlicer - name: update Info.plist working-directory: ./build/src run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist @@ -53,32 +56,32 @@ jobs: working-directory: ./build run: | mkdir pack - mkdir pack/Slic3r - mkdir pack/Slic3r/Slic3r.app - mkdir pack/Slic3r/Slic3r.app/Contents - mkdir pack/Slic3r/Slic3r.app/Contents/_CodeSignature - mkdir pack/Slic3r/Slic3r.app/Contents/Frameworks - mkdir pack/Slic3r/Slic3r.app/Contents/MacOS + mkdir pack/SuperSlicer + mkdir pack/SuperSlicer/SuperSlicer.app + mkdir pack/SuperSlicer/SuperSlicer.app/Contents + mkdir pack/SuperSlicer/SuperSlicer.app/Contents/_CodeSignature + mkdir pack/SuperSlicer/SuperSlicer.app/Contents/Frameworks + mkdir pack/SuperSlicer/SuperSlicer.app/Contents/MacOS - name: copy Resources working-directory: ./build run: | - cp -Rf ../resources pack/Slic3r/Slic3r.app/Contents/Resources - cp pack/Slic3r/Slic3r.app/Contents/Resources/icons/slic3r.icns pack/Slic3r/Slic3r.app/Contents/resources/Slic3r.icns - cp src/Info.date.plist pack/Slic3r/Slic3r.app/Contents/Info.plist + cp -Rf ../resources pack/SuperSlicer/SuperSlicer.app/Contents/Resources + cp pack/SuperSlicer/SuperSlicer.app/Contents/Resources/icons/slic3r.icns pack/SuperSlicer/SuperSlicer.app/Contents/resources/Slic3r.icns + cp src/Info.date.plist pack/SuperSlicer/SuperSlicer.app/Contents/Info.plist echo -n -e 'APPL????\x0a' > PkgInfo - cp PkgInfo pack/Slic3r/Slic3r.app/Contents/PkgInfo + cp PkgInfo pack/SuperSlicer/SuperSlicer.app/Contents/PkgInfo # echo -n -e '\xff\xfeAPPL\x3f\x00\x3f\x00\x3f\x00\x3f\x00\x0a\x00' > PkgInfo - name: copy bin and do not let it lower case working-directory: ./build run: | - cp -f src/Slic3r pack/Slic3r/Slic3r.app/Contents/MacOS/Slic3r - chmod u+x pack/Slic3r/Slic3r.app/Contents/MacOS/Slic3r - tar -cvf Slic3r.tar pack/Slic3r + cp -f src/SuperSlicer pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer + chmod u+x pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer + tar -cvf SuperSlicer.tar pack/SuperSlicer - name: create dmg working-directory: ./build run: | - hdiutil create -ov -fs HFS+ -volname "Slic3r" -srcfolder "pack/Slic3r" temp.dmg - hdiutil convert temp.dmg -format UDZO -o Slic3r.dmg + hdiutil create -ov -fs HFS+ -volname "SuperSlicer" -srcfolder "pack/SuperSlicer" temp.dmg + hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg # - name: signing Resources (creating CodeResources inside _CodeSignature) # working-directory: . # run: codesign -s Resources @@ -87,12 +90,12 @@ jobs: uses: actions/upload-artifact@v1.0.0 with: name: nightly_macos.tar - path: build/Slic3r.tar + path: build/SuperSlicer.tar - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: nightly_macos.dmg - path: build/Slic3r.dmg + path: build/SuperSlicer.dmg # build again, but the debug one this time # - name: cmake # working-directory: ./build @@ -103,15 +106,15 @@ jobs: # - name: copy bin and do not let it lower case # working-directory: ./build # run: | -# cp -f src/Slic3r Slic3r/Slic3r.app/Contents/MacOS/Slic3r -# chmod u+x Slic3r/Slic3r.app/Contents/MacOS/Slic3r -# tar -cvf Slic3r.tar Slic3r +# cp -f src/superslicer SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer +# chmod u+x SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer +# tar -cvf SuperSlicer.tar SuperSlicer # - name: create dmg # working-directory: ./build # run: | -# rm Slic3r.dmg -# hdiutil create -ov -fs HFS+ -volname "Slic3r" -srcfolder "Slic3r" temp.dmg -# hdiutil convert temp.dmg -format UDZO -o Slic3r.dmg +# rm SuperSlicer.dmg +# hdiutil create -ov -fs HFS+ -volname "SuperSlicer" -srcfolder "SuperSlicer" temp.dmg +# hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg # - name: Upload artifact # uses: actions/upload-artifact@v1.0.0 # with: diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index f1d2858b0dc..be018a1e923 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -14,6 +14,9 @@ jobs: - uses: actions/checkout@v2 with: ref: 'CI' + - name: update submodule profiles + working-directory: ./resources/profiles + run: git submodule update - name: change date in version run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc - name: update clock @@ -43,10 +46,10 @@ jobs: run: mkdir build - name: cmake working-directory: ./build - run: cmake .. -DCMAKE_PREFIX_PATH="/home/runner/work/Slic3r/Slic3r/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 - - name: make Slic3r + run: cmake .. -DCMAKE_PREFIX_PATH="/home/runner/work/SuperSlicer/SuperSlicer/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 + - name: make SuperSlicer working-directory: ./build - run: make Slic3r + run: make SuperSlicer - name: create directory and copy into it working-directory: ./build run: | @@ -57,27 +60,27 @@ jobs: run: cp -Rf ../resources package/resources - name: copy bin working-directory: ./build - run: cp -f src/Slic3r package/bin/Slic3r + run: cp -f src/superslicer package/bin/superslicer - name: create sh from echo working-directory: ./build/package run: | - echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/Slic3r" "$@"' >Slic3r - chmod u+x Slic3r - tar -cvf ../Slic3r.tar . + echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/superslicer" "$@"' >superslicer + chmod u+x superslicer + tar -cvf ../SuperSlicer.tar . - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: nightly_linux.tar - path: build/Slic3r.tar + path: build/SuperSlicer.tar - name: build appimage working-directory: ./build/package run: | - chmod +x ../build_appimage.sh - ../build_appimage.sh Slic3r_ubu64.AppImage + chmod +x ../../src/platform/unix/build_appimage.sh + ../../src/platform/unix/build_appimage.sh SuperSlicer_ubu64.AppImage - name: Upload appimage uses: actions/upload-artifact@v1.0.0 with: - name: Slic3r-AppImage.tar - path: build/package/Slic3r_ubu64.AppImage + name: SuperSlicer-AppImage.tar + path: build/package/SuperSlicer_ubu64.AppImage \ No newline at end of file diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 0ac62b5bee7..63106ef1b80 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -34,6 +34,9 @@ jobs: steps: - uses: actions/checkout@v1 - uses: ilammy/msvc-dev-cmd@v1 + - name: update submodule profiles + working-directory: ./resources/profiles + run: git submodule update - name: change date in version shell: powershell run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("_" + [datetime]::Today.ToString("yyyy-MM-dd"))} | Set-Content version.inc @@ -52,7 +55,7 @@ jobs: run: mkdir build - name: cmake working-directory: ./build - run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\Slic3r\Slic3r\deps\destdir\usr\local" + run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\SuperSlicer\SuperSlicer\deps\destdir\usr\local" - name: make working-directory: ./build run: msbuild /m /P:Configuration=Release INSTALL.vcxproj @@ -67,15 +70,15 @@ jobs: - name: copy from release working-directory: ./build shell: powershell - run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/Slic3r/releases/download/2.2.53.3/Slic3r_2.2.53.3_win64_20201005.zip", "Slic3r_2.2.53.3_win64_20201005.zip")' + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer/releases/download/2.2.53.3/SuperSlicer_2.2.53.3_win64_20201005.zip", "SuperSlicer_2.2.53.3_win64_20201005.zip")' - name: unzip working-directory: ./build shell: cmd - run: '"C:/Program Files/7-Zip/7z.exe" x Slic3r_2.2.53.3_win64_20201005.zip' + run: '"C:/Program Files/7-Zip/7z.exe" x SuperSlicer_2.2.53.3_win64_20201005.zip' - name: copy old release content working-directory: ./build shell: cmd - run: xcopy /RCYIE Slic3r_2.2.53.3_win64_20201005\* package\ + run: xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\* package\ - name: copy new resources working-directory: ./build shell: cmd diff --git a/README.md b/README.md index f980d0a3fff..a1564dc858c 100644 --- a/README.md +++ b/README.md @@ -1,93 +1,109 @@ -![](var/Slic3r_128px.png) Slic3r [![Build Status](https://travis-ci.org/slic3r/Slic3r.svg?branch=master)](https://travis-ci.org/slic3r/Slic3r) [![Build status](https://ci.appveyor.com/api/projects/status/8iqmeat6cj158vo6?svg=true)](https://ci.appveyor.com/project/lordofhyphens/slic3r) [![Build Status](http://osx-build.slic3r.org:8080/buildStatus/icon?job=Slic3r)](http://osx-build.slic3r.org:8080/job/Slic3r)![Coverity Status](https://scan.coverity.com/projects/17257/badge.svg) -====== -We have automated builds for Windows (64-bit) and OSX (>= 10.7). [Get a fresh build now](http://dl.slic3r.org/dev/) and stay up-to-date with the development! +[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://discord.gg/ygBBdRRwJY) -The MacOS X build server is kindly sponsored by: +# SuperSlicer -### So, what's this Slic3r? +**A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) -Slic3r is mainly a **toolpath generator** for 3D printers: it reads 3D models (STL, OBJ, AMF, 3MF) and it converts them into **G-code** instructions for 3D printers. But it does much more than that, see the [features list](#features) below. +Prebuilt Windows, Linux and macOS 64-bit releases are available through the [git releases page](https://github.com/supermerill/SuperSlicer/releases). The Linux & macOS builds aren't tested (by me), just compiled, so please report any bugs that may occur during use. +Nightly builds are available through the [git actions page](https://github.com/supermerill/SuperSlicer/actions). Click on the build for your platform and then on 'Artifacts (1)' in the top right corner. -Slic3r was born in **2011** within the RepRap community and thanks to its high configurability became the swiss-army knife for 3D printing. It served as a platform for implementing several **new (experimental) ideas that later became technology standards**, such as multiple extruders, brim, variable-height layers, per-object settings, modifiers, post-processing scripts, G-code macros and more. Despite being based on volunteer efforts, Slic3r is still pushing the boundaries of 3D printing. +SuperSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code +instructions for FFF printers or PNG layers for mSLA 3D printers. It's compatible with any modern printer based on the RepRap toolchain which is running a firmware based on Marlin, Prusa, Klipper, etc. -Slic3r has been rebased from the active PrusaSlicer and SuperSlicer forks with an eye towards continuing pushing the boundaries of 3D printing and being an slicer for all printers. +SuperSlicer is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research. +PrusaSlicer is based on [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. -Slic3r is: +See the [wiki](https://github.com/supermerill/SuperSlicer/wiki) and +the [documentation directory](doc/) for information about compilation. -* **Open:** it is totally **open source** and it's **independent from any commercial company** or printer manufacturer. We want to keep 3D printing open and free. -* **Compatible:** it supports all the known G-code dialects (Marlin, Repetier, Mach3, LinuxCNC, Machinekit, Smoothie, Makerware, Sailfish). -* **Advanced:** many configuration options allow for fine-tuning and full control. While novice users often need just few options, Slic3r is mostly used by advanced users. -* **Community-driven:** new features or issues are discussed in the [GitHub repository](https://github.com/slic3r/Slic3r/issues). Join our collaborative effort and help improve it! -* **Robust:** the codebase includes more than 1,000 unit and regression tests, collected in 6 years of development. -* **Modular:** the core of Slic3r is libslic3r, a C++ library that provides a granular API and reusable components. -* **Embeddable:** a complete and powerful command line interface allows Slic3r to be used from the shell or integrated with server-side applications. -* **Powerful:** see the list below! +### What are SuperSlicer main features? main new features/differences? -See the [project homepage](http://slic3r.org/) at slic3r.org for more information. +* Custom-made generated calibration tests. +* **Ironing** top surface & many new settings to fine-tune the top surface quality, like 'only one perimeter on top'. +* A "denser infill" option for supporting the (solid) top layers. +* Better **Thin walls** (anchored inside the print, no more random bits at the ends, embedded in perimeter loops). +* Options to change holes dimensions and/or geometry, to print them at the right size. +* Better overhangs (add perimeters if needed, slice them in opposite direction each layer). +* Brim rework: many more options (inside, outside only, 'ears', per object) +* Some new seam options, to help hide them. +* Built-in calibration prints +* Built-in object generation script +* Can join perimeters into a big one to avoid travel moves. +* Many other little options and corrections (like the filled concentric pattern). +* It has also all the current slic3rPE/PrusaSlicer features. -### Features +### Complete changelog [here](https://github.com/supermerill/SuperSlicer/wiki) -(Most of these are also available in the command line interface.) +See the wiki for examples. -* **G-code generation** for FFF/FDM printers; -* **conversion** between STL, OBJ, AMF, 3MF and POV formats; -* **auto-repair** of non-manifold meshes (and ability to re-export them); -* **SVG export** of slices; -* built-in **USB/serial** host controller, supporting **multiple simultaneous printers** each one with a spool queue; -* **OctoPrint integration** (send to printer); -* built-in **projector and host for DLP printers**; -* tool for **cutting meshes** in multiple solid parts with visual preview (also in batch using a grid); -* tool for **extruding 2.5D TIN meshes**. +### What are SuperSlicer / PrusaSlicer / Slic3r's main features? -### What language is it written in? +Key features are: -The core parts of Slic3r are written in C++11, with multithreading. The graphical interface is in the process of being ported to C++14. +* **Multi-platform** (Linux/Mac/Win) and packaged as standalone-app with no dependencies required +* Complete **command-line interface** to use it without GUI +* Multi-material **(multiple extruders)** object printing +* Multiple G-code flavors supported (RepRap, Makerbot, Mach3, Machinekit, etc.) +* Ability to plate **multiple objects having distinct print settings** +* **Multithread** processing +* **STL auto-repair** (tolerance for broken models) +* Wide automated unit testing -### How to install? +Other major features are: -You can download a precompiled package from [slic3r.org](http://slic3r.org/) (releases) or from [dl.slicr3r.org](http://dl.slic3r.org/dev/) (automated builds). +* Combine infill every 'n' perimeters layer & varying density to speed up printing +* **3D preview** (including multi-material files) +* **Multiple layer heights** in a single print +* **Spiral vase** mode for bumpless vases +* Fine adjustment of speed, acceleration, and extrusion width +* Several infill patterns including honeycomb, spirals, Hilbert curves, gyroid +* Support material, raft, brim, skirt +* **Standby temperature** and automatic wiping for multi-extruder printing +* [Customizable **G-code macros**](https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-Prusa-Edition-Macro-Language) and output filename with variable placeholders +* Support for **post-processing scripts** +* **Cooling logic** controlling fan speed and dynamic print speed -If you want to compile the source yourself follow the instructions on one of these wiki pages: -* [Linux](https://github.com/slic3r/Slic3r/wiki/Running-Slic3r-from-git-on-GNU-Linux) -* [Windows](https://github.com/slic3r/Slic3r/wiki/Running-Slic3r-from-git-on-Windows) -* [Mac OSX](https://github.com/slic3r/Slic3r/wiki/Running-Slic3r-from-git-on-OS-X) +[Command-Line Interface](https://github.com/prusa3d/PrusaSlicer/wiki/Command-Line-Interface) wiki page. -### Can I help? +## Development -Sure, but please read the -[CONTRIBUTING](https://github.com/slic3r/Slic3r/blob/master/.github/CONTRIBUTING.md) -document first! +### What language is it written in? -### Directory structure +Almost everything is written in C++. -* `package/`: the scripts used for packaging the executables -* `src/`: the C++ source of the `slic3r` executable and the CMake definition file for compiling it -* `src/slic3r/GUI`: The C++ GUI. -* `tests`: Test suite for Slic3r. Implemented with [Catch2](https://github.com/catchorg/Catch2) -* `t/`: the really old test suite (deprecated) -* `utils/`: various useful scripts -* `src/libslic3r/`: C++ sources for libslic3r -* `xs/xsp/`: bindings for calling libslic3r from Perl (XS) (deprecated) +The slicing core is the `libslic3r` library, which can be built and used in a standalone way. +The command-line interface is a thin wrapper over `libslic3r`. +You can download a precompiled package from the release page - it will run without the need for any dependency. -## Licensing and attribution +### How to compile -Slic3r is licensed under the _GNU Affero General Public License, version 3_. +If you want to compile the source yourself, follow the instructions on one of +these documentation pages: +* [Linux](doc/How%20to%20build%20-%20Linux%20et%20al.md) +* [macOS](doc/How%20to%20build%20-%20Mac%20OS.md) +* [Windows](doc/How%20to%20build%20-%20Windows.md) -PrusaSlicer is licensed under the _GNU Affero General Public License, version 3_. -PrusaSlicer is owned by Prusa Research. -PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci. +You can also look at the workflow YAML-files for [git actions](https://github.com/supermerill/Slic3r/tree/master/.github/workflows), as they describe how to build from source from a "virgin" dev computer. -The _GNU Affero General Public License, version 3_ ensures that if you **use** any part of this software in any way (even behind a web server), your software must be released under the same license. +### Can I help? -### Acknowledgements +Sure! You can do the following to find things that are available to help with: +* Add an issue to the GitHub tracker **if it isn't already present**. -The main author of Slic3r is Alessandro Ranellucci (@alranel, *Sound* in IRC, [@alranel](http://twitter.com/alranel) on Twitter), who started the project in 2011. +Before sending patches and pull requests contact me (preferably through opening a GitHub issue or commenting on an existing, related, issue) to discuss your proposed +changes. This way we can ensure that nobody wastes their time and no conflicts arise in development. -Joseph Lenox (@lordofhyphens, *LoH* in IRC, [@LenoxPlay](http://twitter.com/LenoxPlay) on Twitter) is the current co-maintainer. +## License and attribution -Contributions by Henrik Brix Andersen, Vojtech Bubnik, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Y. Sapir, Mike Sheldrake, Kliment Yanev and numerous others. Original manual by Gary Hodgson. Slic3r logo designed by Corey Daniels, Silk Icon Set designed by Mark James, stl and gcode file icons designed by Akira Yasuda. +SuperSlicer is licensed under the _GNU Affero General Public License, version 3_. +SuperSlicer is based on PrusaSlicer by PrusaResearch. -### How can I invoke Slic3r using the command line? +PrusaSlicer is licensed under the _GNU Affero General Public License, version 3_. +PrusaSlicer is owned by Prusa Research. +PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci. -The command line is documented in the relevant [manual page](https://manual.slic3r.org/advanced/command-line). +Slic3r is licensed under the _GNU Affero General Public License, version 3_. +Slic3r was created by Alessandro Ranellucci with the help of many other contributors. + +The _GNU Affero General Public License, version 3_ ensures that if you **use** any part of this software in any way (even behind a web server), your software must be released under the same license. diff --git a/version.inc b/version.inc index 41667c68f97..29ec546a525 100644 --- a/version.inc +++ b/version.inc @@ -2,16 +2,16 @@ # (the version numbers are generated by the build script from the git current label) # name of the slicer -set(SLIC3R_APP_NAME "Slic3r") +set(SLIC3R_APP_NAME "SuperSlicer") # Key fo the slicer, must only contains ascii chars and no spaces -set(SLIC3R_APP_KEY "Slic3r") +set(SLIC3R_APP_KEY "SuperSlicer") # exe name of the slicer, should be lowercase and valid in all os -set(SLIC3R_APP_CMD "Slic3r") +set(SLIC3R_APP_CMD "superslicer") # versions -set(SLIC3R_VERSION "2.0") -set(SLIC3R_VERSION_FULL "2.0.00.0") +set(SLIC3R_VERSION "2.3.56") +set(SLIC3R_VERSION_FULL "2.3.56.0") set(SLIC3R_BUILD_ID "Slic3r_${SLIC3R_VERSION_FULL}") -set(SLIC3R_RC_VERSION "2,0,00,0") +set(SLIC3R_RC_VERSION "2,3,56,0") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer @@ -20,10 +20,10 @@ set(GCODEVIEWER_APP_KEY "GCodeViewer") set(GCODEVIEWER_APP_CMD "gcodeviewer") # string to be added after the SLIC3R_APP_NAME on some places -set(SLIC3R_BASED_ON "") +set(SLIC3R_BASED_ON "a flavored version of Slic3r") # to get he github repo -set(SLIC3R_GITHUB "slic3r/Slic3r") +set(SLIC3R_GITHUB "supermerill/SuperSlicer") # download url -set(SLIC3R_DOWNLOAD "https://slic3r.org/download") +set(SLIC3R_DOWNLOAD "https://github.com/supermerill/SuperSlicer/releases") # string to display in the spalshscreen -set(SLIC3R_INTRO "Slic3r contains sizable contributions from Prusa Research. Original work by Alessandro Ranellucci and the RepRap community.") +set(SLIC3R_INTRO "SuperSlicer is a skinned version of Slic3r, based on the original Slic3r by Alessandro Ranellucci & the RepRap community, and PrusaSlicer by Prusa.") \ No newline at end of file