From 0279c6da42e78adaba4d9456fb7ac12fd48660f4 Mon Sep 17 00:00:00 2001 From: remi durand Date: Mon, 12 Apr 2021 02:15:39 +0200 Subject: [PATCH 01/56] Fix dll name --- src/PrusaSlicer_app_msvc.cpp | 5 ++--- src/platform/msw/Slic3r.rc.in | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/PrusaSlicer_app_msvc.cpp b/src/PrusaSlicer_app_msvc.cpp index 972f47d163b..161c93a27fe 100644 --- a/src/PrusaSlicer_app_msvc.cpp +++ b/src/PrusaSlicer_app_msvc.cpp @@ -283,12 +283,11 @@ int wmain(int argc, wchar_t **argv) wchar_t path_to_slic3r[MAX_PATH + 1] = { 0 }; wcscpy(path_to_slic3r, path_to_exe); - wcscat(path_to_slic3r, SLIC3R_APP_WKEY); - wcscat(path_to_slic3r, L".dll"); + wcscat(path_to_slic3r, L"Slic3r.dll"); // printf("Loading Slic3r library: %S\n", path_to_slic3r); HINSTANCE hInstance_Slic3r = LoadLibraryExW(path_to_slic3r, nullptr, 0); if (hInstance_Slic3r == nullptr) { - printf(SLIC3R_APP_KEY ".dll was not loaded, error code: %d\n", GetLastError()); + printf("Slic3r.dll was not loaded, error code: %d\n", GetLastError()); return -1; } diff --git a/src/platform/msw/Slic3r.rc.in b/src/platform/msw/Slic3r.rc.in index 6d4ae811e3a..bee2d036738 100644 --- a/src/platform/msw/Slic3r.rc.in +++ b/src/platform/msw/Slic3r.rc.in @@ -22,4 +22,4 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@ } } 2 ICON "@SLIC3R_RESOURCES_DIR@/icons/@SLIC3R_APP_KEY@.ico" -1 24 "Slic3r.manifest" +1 24 "@SLIC3R_APP_KEY@.manifest" From 39c95d7fedac6a8504351bc9218f3f54fb663c54 Mon Sep 17 00:00:00 2001 From: remi durand Date: Sun, 4 Apr 2021 15:48:06 +0200 Subject: [PATCH 02/56] 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 From 1b35362991f12ef7ed9448062a7e93f0c91eee9b Mon Sep 17 00:00:00 2001 From: remi durand Date: Mon, 12 Apr 2021 21:37:05 +0200 Subject: [PATCH 03/56] fix renaming, build & doc --- .github/workflows/ccpp_mac.yml | 6 ++-- .github/workflows/ccpp_ubuntu.yml | 6 ++-- CMakeLists.txt | 39 +++++++++++++++----------- doc/How to build - Linux et al.md | 17 ++++++++++- doc/How to build - Mac OS.md | 13 +++++++++ doc/How to build - Windows.md | 14 +++++++++ src/CMakeLists.txt | 8 +++--- src/platform/msw/gcodeviewer.rc.in | 2 +- src/platform/unix/Slic3r.desktop.in | 2 +- src/platform/unix/build_appimage.sh.in | 4 +-- 10 files changed, 79 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 27f8f7a0b72..be078103173 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -48,7 +48,7 @@ jobs: run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1 - name: make SuperSlicer working-directory: ./build - run: make SuperSlicer + run: make Slic3r - name: update Info.plist working-directory: ./build/src run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist @@ -66,7 +66,7 @@ jobs: working-directory: ./build run: | 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 pack/SuperSlicer/SuperSlicer.app/Contents/Resources/icons/SuperSlicer.icns pack/SuperSlicer/SuperSlicer.app/Contents/resources/SuperSlicer.icns cp src/Info.date.plist pack/SuperSlicer/SuperSlicer.app/Contents/Info.plist echo -n -e 'APPL????\x0a' > PkgInfo cp PkgInfo pack/SuperSlicer/SuperSlicer.app/Contents/PkgInfo @@ -74,7 +74,7 @@ jobs: - name: copy bin and do not let it lower case working-directory: ./build run: | - cp -f src/SuperSlicer pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer + 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 diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index be018a1e923..bae1b16662c 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -49,7 +49,7 @@ jobs: 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 SuperSlicer + run: make Slic3r - name: create directory and copy into it working-directory: ./build run: | @@ -75,8 +75,8 @@ jobs: - name: build appimage working-directory: ./build/package run: | - chmod +x ../../src/platform/unix/build_appimage.sh - ../../src/platform/unix/build_appimage.sh SuperSlicer_ubu64.AppImage + chmod +x ../build_appimage.sh + ../build_appimage.sh - name: Upload appimage uses: actions/upload-artifact@v1.0.0 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index b405bcce96f..0e622aeff31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -514,21 +514,26 @@ if(SLIC3R_BUILD_TESTS) add_subdirectory(tests) endif() +if (NOT WIN32 AND NOT APPLE) + configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY) +endif() # Resources install target, configure fhs.hpp on UNIX if (WIN32) install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") elseif (SLIC3R_FHS) # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share) - set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Slic3r") + set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/${SLIC3R_APP_KEY}") install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${SLIC3R_FHS_RESOURCES}") - install(FILES src/platform/unix/Slic3r.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) - install(FILES src/platform/unix/Gcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) - install(FILES resources/icons/Slic3r_192px.png DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps RENAME Slic3r.png) - install(FILES resources/icons/PrusaSlicer-gcodeviewer_192px.png DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps RENAME Slic3r-gcodeviewer.png) + configure_file(${LIBDIR}/platform/unix/Slic3r.desktop.in ${LIBDIR_BIN}/${SLIC3R_APP_KEY}.desktop @ONLY) + configure_file(${LIBDIR}/platform/unix/Gcodeviewer.desktop.in ${LIBDIR_BIN}/${SLIC3R_APP_KEY}-Gcodeviewer.desktop @ONLY) + install(FILES ${LIBDIR_BIN}/${SLIC3R_APP_KEY}.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) + install(FILES ${LIBDIR_BIN}/${SLIC3R_APP_KEY}-Gcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) + install(FILES resources/icons/${SLIC3R_APP_KEY}_192px.png DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps RENAME ${SLIC3R_APP_KEY}.png) + install(FILES resources/icons/${SLIC3R_APP_KEY}-gcodeviewer_192px.png DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps RENAME ${SLIC3R_APP_KEY}-gcodeviewer.png) else () - install(FILES src/platform/unix/Slic3r.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) - install(FILES src/platform/unix/Gcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) + install(FILES ${LIBDIR}/platform/unix/Slic3r.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) + install(FILES ${LIBDIR}/platform/unix/Gcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") endif () @@ -537,17 +542,17 @@ configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fh if (WIN32) else () set(CPACK_GENERATOR "STGZ;TGZ;TZ") - set(CPACK_NSIS_DISPLAY_NAME "Slic3r 2.0") + set(CPACK_NSIS_DISPLAY_NAME "${SLIC3R_APP_NAME} ${SLIC3R_VERSION}") set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/cmake/CPackConfig.cmake") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool") - set(CPACK_PACKAGE_EXECUTABLES "Slic3r") - set(CPACK_PACKAGE_FILE_NAME "slic3r-2.0-Linux-x86_64") - set(CPACK_PACKAGE_INSTALL_DIRECTORY "Slic3r 2.0") - set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Slic3r 2.0.0") - set(CPACK_PACKAGE_NAME "Slic3r") - set(CPACK_PACKAGE_VENDOR "Slic3r") - set(CPACK_PACKAGE_VERSION "2.0.0") + set(CPACK_PACKAGE_EXECUTABLES "${SLIC3R_APP_CMD}") + set(CPACK_PACKAGE_FILE_NAME "${SLIC3R_APP_KEY}-${SLIC3R_VERSION}-Linux-x86_64") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "${SLIC3R_APP_KEY} ${SLIC3R_VERSION}") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${SLIC3R_BUILD_ID}") + set(CPACK_PACKAGE_NAME "${SLIC3R_APP_KEY}") + set(CPACK_PACKAGE_VENDOR "${SLIC3R_APP_NAME}") + set(CPACK_PACKAGE_VERSION "${SLIC3R_VERSION_FULL}") set(CPACK_PACKAGE_VERSION_MAJOR "2") set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_PATCH "0") @@ -555,9 +560,9 @@ else () set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_SOURCE_GENERATOR "TGZ;TZ") - set(CPACK_SOURCE_PACKAGE_FILE_NAME "Slic3r-2.0.0") + set(CPACK_SOURCE_PACKAGE_FILE_NAME "${SLIC3R_APP_KEY}-${SLIC3R_VERSION_FULL}") set(CPACK_SOURCE_STRIP_FILES "") - set(CPACK_STRIP_FILES "bin/Slic3r") + set(CPACK_STRIP_FILES "bin/${SLIC3R_APP_CMD}") set(CPACK_SYSTEM_NAME "Linux-x86_64") set(CPACK_TOPLEVEL_TAG "Linux-x86_64") endif() diff --git a/doc/How to build - Linux et al.md b/doc/How to build - Linux et al.md index d300011636b..f2408264bad 100644 --- a/doc/How to build - Linux et al.md +++ b/doc/How to build - Linux et al.md @@ -1,11 +1,12 @@ # Building SuperSlicer on UNIX/Linux + SuperSlicer uses the CMake build system and requires several dependencies. The dependencies can be listed in `deps/deps-linux.cmake` and `deps/deps-unix-common.cmake`, although they don't necessarily need to be as recent as the versions listed - generally versions available on conservative Linux distros such as Debian stable or CentOS should suffice. -Perl is not required any more. +Perl is not required anymore. In a typical situation, one would open a command line, go to the SuperSlicer sources, create a directory called `build` or similar, `cd` into it and call: @@ -17,6 +18,20 @@ where `N` is the number of CPU cores available. Additional CMake flags may be applicable as explained below. +### How to get the source code + +You have to gitclone the repository +``` +git clone https://github.com/supermerill/SuperSlicer.git +``` + +and then you have to clone the profiles submodules + +``` +cd resources/profiles +git submodule update +``` + ## How to build, the easy way You can follow the [script](https://github.com/supermerill/SuperSlicer/blob/master/.github/workflows/ccpp_ubuntu.yml) the build server use to create the ubuntu release. diff --git a/doc/How to build - Mac OS.md b/doc/How to build - Mac OS.md index b896159ee66..15c0ab5c9c2 100644 --- a/doc/How to build - Mac OS.md +++ b/doc/How to build - Mac OS.md @@ -11,6 +11,19 @@ To build SuperSlicer on Mac OS, you will need the following software: XCode is available through Apple's App Store, the other three tools are available on [brew](https://brew.sh/) (use `brew install cmake git gettext` to install them). +### How to get the source code + +You have to gitclone the repository +``` +git clone https://github.com/supermerill/SuperSlicer.git +``` + +and then you have to clone the profiles submodules + +``` +cd resources/profiles +git submodule update +``` ### How to build You can follow the [script](https://github.com/supermerill/SuperSlicer/blob/master/.github/workflows/ccpp_mac.yml) the build server use to create the ubuntu release. diff --git a/doc/How to build - Windows.md b/doc/How to build - Windows.md index cc4a77d5481..bbdc0fdfa6d 100644 --- a/doc/How to build - Windows.md +++ b/doc/How to build - Windows.md @@ -6,6 +6,20 @@ CMake installer can be downloaded from [the official website](https://cmake.org/ Building with [Visual Studio 2017 Community Edition](https://www.visualstudio.com/vs/older-downloads/). should work too. +### How to get the source code + +You have to gitclone the repository +``` +git clone https://github.com/supermerill/SuperSlicer.git +``` + +and then you have to clone the profiles submodules + +``` +cd resources/profiles +git submodule update +``` + ### How to build You have to build the dependancies (in ./deps/build) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0e37ef7d342..427a2534683 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -107,9 +107,9 @@ if (MINGW) set_target_properties(Slic3r PROPERTIES PREFIX "") endif (MINGW) -if (NOT WIN32 AND NOT APPLE) +if (NOT WIN32) # Binary name on unix like systems (Linux, Unix) - set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "Slic3r") + set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}") endif () target_link_libraries(Slic3r libslic3r cereal) @@ -160,7 +160,7 @@ if (WIN32) endif() target_compile_definitions(Slic3r_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE) add_dependencies(Slic3r_app_gui Slic3r) - set_target_properties(Slic3r_app_gui PROPERTIES OUTPUT_NAME "slic3r") + set_target_properties(Slic3r_app_gui PROPERTIES OUTPUT_NAME ${SLIC3R_APP_CMD}) target_link_libraries(Slic3r_app_gui PRIVATE boost_headeronly) add_executable(Slic3r_app_console PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/${SLIC3R_APP_KEY}.rc) @@ -224,7 +224,7 @@ else () COMMAND ln -sf Slic3r prusa-gcodeviewer COMMAND ln -sf Slic3r PrusaGCodeViewer WORKING_DIRECTORY "$" - COMMENT "Symlinking the G-code viewer to Slic3r, symlinking to slic3r and prusa-gcodeviewer" + COMMENT "Symlinking the G-code viewer to Slic3r, symlinking to slic3r and gcodeviewer" VERBATIM) else () add_custom_command(TARGET Slic3r POST_BUILD diff --git a/src/platform/msw/gcodeviewer.rc.in b/src/platform/msw/gcodeviewer.rc.in index e535e043ba6..272e8a6fda9 100644 --- a/src/platform/msw/gcodeviewer.rc.in +++ b/src/platform/msw/gcodeviewer.rc.in @@ -22,4 +22,4 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@ } } 2 ICON "@SLIC3R_RESOURCES_DIR@/icons/PrusaSlicer-gcodeviewer.ico" -1 24 "Slic3r.manifest" +1 24 "@SLIC3R_APP_KEY@.manifest" diff --git a/src/platform/unix/Slic3r.desktop.in b/src/platform/unix/Slic3r.desktop.in index f61a779bbc3..d3b59ea84af 100644 --- a/src/platform/unix/Slic3r.desktop.in +++ b/src/platform/unix/Slic3r.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -Name=@SLIC3R_APP_KEY@ +Name=@SLIC3R_APP_NAME@ GenericName=3D Printing Software Comment=G-code generator for 3D printers Icon=@SLIC3R_APP_KEY@ diff --git a/src/platform/unix/build_appimage.sh.in b/src/platform/unix/build_appimage.sh.in index 90583e760d8..953fe4af603 100644 --- a/src/platform/unix/build_appimage.sh.in +++ b/src/platform/unix/build_appimage.sh.in @@ -2,7 +2,7 @@ APPIMAGETOOLURL="https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage" -APP_IMAGE=$1 +APP_IMAGE="@SLIC3R_APP_KEY@_ubu64.AppImage" wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage chmod +x ../appimagetool.AppImage @@ -24,5 +24,5 @@ EOF ../appimagetool.AppImage . -mv Slic3r-x86_64.AppImage ${APP_IMAGE} +mv @SLIC3R_APP_KEY@-x86_64.AppImage ${APP_IMAGE} chmod +x ${APP_IMAGE} From c5ef2733ed4bb8e998c41a964e9162cb1b9d70d3 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 26 Apr 2021 15:55:23 +0200 Subject: [PATCH 04/56] default accent color back to blue --- resources/ui_layout/colors.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/ui_layout/colors.ini b/resources/ui_layout/colors.ini index ab889d5a3f7..3f894ac9023 100644 --- a/resources/ui_layout/colors.ini +++ b/resources/ui_layout/colors.ini @@ -17,8 +17,8 @@ Wipe tower = B3E3AB Mill = B3B3B3 Custom = 28CC94 Mixed = 000000 -Gui_color_very_dark = ada230 -Gui_color_dark = cabe39 -Gui_color = eddc21 -Gui_color_light = ffee38 -Gui_color_very_light = fef48b \ No newline at end of file +Gui_color_very_dark = 0047C7 +Gui_color_dark = 2172eb +Gui_color = 428dfd +Gui_color_light = 8bb9fe +Gui_color_very_light = 428cff \ No newline at end of file From 2e9562d5d7b6e05cad56d0d9a7203722520b9d3d Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Wed, 28 Apr 2021 11:43:00 -0500 Subject: [PATCH 05/56] build all PR's --- .github/workflows/ccpp_mac.yml | 3 +++ .github/workflows/ccpp_ubuntu.yml | 3 +++ .github/workflows/ccpp_win.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index be078103173..3a5c33cc137 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -4,6 +4,9 @@ on: push: branches: - CI + pull_request: + branches: + - '*' jobs: build: diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index bae1b16662c..1a07f8ab969 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -4,6 +4,9 @@ on: push: branches: - CI + pull_request: + branches: + - '*' jobs: build: diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 63106ef1b80..6ab6aab6fd4 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -4,6 +4,9 @@ on: push: branches: - CI + pull_request: + branches: + - '*' jobs: build_dep: From 22c00bc209e6c1b19c88875b89f82f04f6c6292e Mon Sep 17 00:00:00 2001 From: Eisen Montalvo Date: Sun, 2 May 2021 10:04:45 -0700 Subject: [PATCH 06/56] Ignore DS_Store files in MacOS --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 1d68b940c84..049c24a725d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ xs/assertlib* local-lib build* deps/deps-* + +# MacOS Ignores +.DS_Store From 64046cb200e07ac58820e66e6b59b849ee3ff4bb Mon Sep 17 00:00:00 2001 From: remi durand Date: Sun, 2 May 2021 18:48:53 +0200 Subject: [PATCH 07/56] update actions to superslicer repo --- .github/workflows/ccpp_mac_debug.yml | 36 ++++++++++++------------- .github/workflows/ccpp_ubuntu.yml | 2 +- .github/workflows/ccpp_ubuntu_debug.yml | 20 +++++++------- .github/workflows/ccpp_win_debug.yml | 8 +++--- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml index fc42d921175..74274e0af6d 100644 --- a/.github/workflows/ccpp_mac_debug.yml +++ b/.github/workflows/ccpp_mac_debug.yml @@ -46,7 +46,7 @@ jobs: - name: cmake working-directory: ./build run: cmake .. -DCMAKE_BUILD_TYPE=Debug -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 - name: update Info.plist @@ -56,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/SuperSlicer.icns pack/SuperSlicer/SuperSlicer.app/Contents/resources/SuperSlicer.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 @@ -90,9 +90,9 @@ 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_debug.dmg - path: build/Slic3r.dmg + path: build/SuperSlicer.dmg diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index 0940da50fab..b8b95cba059 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -84,5 +84,5 @@ jobs: uses: actions/upload-artifact@v1.0.0 with: name: SuperSlicer-AppImage.tar - path: build/package/SuperSlicer_ubu64.AppImage + path: build/package/SuperSlicer_ubu64.AppImage.tar diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml index 1ca83177e4f..81c9961197a 100644 --- a/.github/workflows/ccpp_ubuntu_debug.yml +++ b/.github/workflows/ccpp_ubuntu_debug.yml @@ -46,10 +46,10 @@ jobs: run: mkdir build - name: cmake working-directory: ./build - run: cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="/home/runner/work/Slic3r/Slic3r/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 - - name: make Slic3r + run: cmake .. -DCMAKE_BUILD_TYPE=Debug -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: | @@ -60,18 +60,18 @@ 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: | @@ -79,10 +79,10 @@ jobs: ../build_appimage.sh - name: 'Tar files' working-directory: ./build/package - run: tar -cvf Slic3r_ubu64.AppImage.tar Slic3r_ubu64.AppImage + run: tar -cvf SuperSlicer_ubu64.AppImage.tar SuperSlicer_ubu64.AppImage - name: Upload appimage uses: actions/upload-artifact@v1.0.0 with: name: Slic3r-AppImage.tar - path: build/package/Slic3r_ubu64.AppImage.tar + path: build/package/SuperSlicer_ubu64.AppImage.tar diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml index 9e7acc198fa..19841e73d38 100644 --- a/.github/workflows/ccpp_win_debug.yml +++ b/.github/workflows/ccpp_win_debug.yml @@ -55,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=Debug INSTALL.vcxproj @@ -70,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 From 2ab96fc229ed00b3ee3d4b6efb9636f8db9828b5 Mon Sep 17 00:00:00 2001 From: remi durand Date: Thu, 29 Apr 2021 02:33:51 +0200 Subject: [PATCH 08/56] update github template for superslicer --- .github/CONTRIBUTING.md | 30 ++++++----------------- .github/ISSUE_TEMPLATE.md | 17 ++++--------- .github/ISSUE_TEMPLATE/bug_report.md | 11 +++------ .github/ISSUE_TEMPLATE/feature_request.md | 7 +++--- 4 files changed, 20 insertions(+), 45 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e7592854681..33cd093369e 100644 --- a/.github/CONTRIBUTING.md +++ b/.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/alexrj/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 aar@cpan.org. -* Drop Joseph a line at lenox.joseph@gmail.com diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index c890df33c17..6e04d11a0fb 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,11 +1,5 @@ ### 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_ @@ -13,14 +7,13 @@ _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_ \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f7692d54d6a..43e0757196e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,8 +4,6 @@ about: Create a report to help us improve --- -### 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** A clear and concise description of what the bug is. @@ -16,8 +14,8 @@ Steps to reproduce the behavior: 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. +**>> Project File <<** +*Please* upload a ZIP archive containing the project file used when the problem arise. Please export it just before the problem occur. Even if did nothing and there is no object, export it as it contains your current configuration. **Expected behavior** A clear and concise description of what you expected to happen. @@ -27,10 +25,7 @@ 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`_ **Additional context** Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 40d1a461fe6..aed18468720 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.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. From 824b45d301bcffaba8c8b06e1d920aff1f6fc875 Mon Sep 17 00:00:00 2001 From: remi durand Date: Tue, 25 May 2021 22:50:27 +0200 Subject: [PATCH 09/56] 2.3.56.1 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 75d642d7906..0a3d291efcc 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.0") +set(SLIC3R_VERSION_FULL "2.3.56.1") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}") -set(SLIC3R_RC_VERSION "2,3,56,0") +set(SLIC3R_RC_VERSION "2,3,56,1") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 3d417efcbca7f45b46ed3750539fd4076e969bbc Mon Sep 17 00:00:00 2001 From: remi durand Date: Wed, 26 May 2021 22:48:43 +0200 Subject: [PATCH 10/56] update create_release script to superslicer --- create_release.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/create_release.py b/create_release.py index 52fce3fa8f9..36fd799c446 100644 --- a/create_release.py +++ b/create_release.py @@ -14,8 +14,8 @@ import tarfile import subprocess -repo = "slic3r/slic3r" -program_name = "Slic3r" +repo = "supermerill/SuperSlicer" +program_name = "SuperSlicer" path_7zip = r"C:\Program Files\7-Zip\7z.exe" github_auth_token = "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" From 3cf1db66cc88d9a5ec0d06e42adda9fab6b0c260 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 3 Jun 2021 16:31:07 +0200 Subject: [PATCH 11/56] version to 2.3.56.2 --- .github/workflows/ccpp_win_rc.yml | 2 +- version.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp_win_rc.yml b/.github/workflows/ccpp_win_rc.yml index fdbe7d77922..7c6a8c77e80 100644 --- a/.github/workflows/ccpp_win_rc.yml +++ b/.github/workflows/ccpp_win_rc.yml @@ -55,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 diff --git a/version.inc b/version.inc index 9e31b72a2f1..fd252fb7e1c 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.1") +set(SLIC3R_VERSION_FULL "2.3.56.2") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,1") +set(SLIC3R_RC_VERSION "2,3,56,2") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From a2dca698db13c0d3a02f6480f5a7ec5add285a0c Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 4 Jun 2021 13:52:20 +0200 Subject: [PATCH 12/56] update profiles --- resources/profiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles b/resources/profiles index 9d7f8ed10a4..93f0f332d23 160000 --- a/resources/profiles +++ b/resources/profiles @@ -1 +1 @@ -Subproject commit 9d7f8ed10a4ec6112c8076eff21651715d459e0f +Subproject commit 93f0f332d23691720f43ce75d619b34b55bbba89 From 653aeb8a9ab8c7e74d77658086894550bb538165 Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 4 Jun 2021 15:03:50 +0200 Subject: [PATCH 13/56] move rc script to superslicer name --- .github/workflows/ccpp_mac_rc.yml | 36 ++++++++++++++-------------- .github/workflows/ccpp_ubuntu_rc.yml | 20 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml index 01c81261812..48a6ca366f4 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -46,7 +46,7 @@ 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 - name: make .mo @@ -59,32 +59,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/SuperSlicer.icns pack/SuperSlicer/SuperSlicer.app/Contents/resources/SuperSlicer.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 @@ -93,9 +93,9 @@ jobs: uses: actions/upload-artifact@v1.0.0 with: name: rc_macos.tar - path: build/Slic3r.tar + path: build/SuperSlicer.tar - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: rc_macos.dmg - path: build/Slic3r.dmg + path: build/SuperSlicer.dmg diff --git a/.github/workflows/ccpp_ubuntu_rc.yml b/.github/workflows/ccpp_ubuntu_rc.yml index d552b0b77c4..6a0437b1cca 100644 --- a/.github/workflows/ccpp_ubuntu_rc.yml +++ b/.github/workflows/ccpp_ubuntu_rc.yml @@ -46,8 +46,8 @@ 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 - name: make .mo @@ -63,18 +63,18 @@ 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: rc_linux.tar - path: build/Slic3r.tar + path: build/SuperSlicer.tar - name: build appimage working-directory: ./build/package run: | @@ -82,10 +82,10 @@ jobs: ../build_appimage.sh - name: 'Tar files' working-directory: ./build/package - run: tar -cvf Slic3r_ubu64.AppImage.tar Slic3r_ubu64.AppImage + run: tar -cvf SuperSlicer_ubu64.AppImage.tar SuperSlicer_ubu64.AppImage - name: Upload appimage uses: actions/upload-artifact@v1.0.0 with: - name: rc-Slic3r-AppImage.tar - path: build/package/Slic3r_ubu64.AppImage.tar + name: rc-SuperSlicer-AppImage.tar + path: build/package/SuperSlicer_ubu64.AppImage.tar From 6cb6babffc0c5508634b8bf1e2e728b717a07c6d Mon Sep 17 00:00:00 2001 From: meril Date: Sat, 5 Jun 2021 17:43:48 +0200 Subject: [PATCH 14/56] version 2.3.56.3 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 5712c8a6bdf..4db034fa133 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.2") +set(SLIC3R_VERSION_FULL "2.3.56.3") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,2") +set(SLIC3R_RC_VERSION "2,3,56,3") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 2fbea54cb0dd13607ec692d266833525029697d5 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 7 Jun 2021 17:12:42 +0200 Subject: [PATCH 15/56] update credits --- src/slic3r/GUI/AboutDialog.cpp | 2 +- src/slic3r/GUI/GUI_App.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index b42483a03a4..e18652b90c3 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -269,7 +269,7 @@ AboutDialog::AboutDialog() // TRN "Slic3r _is licensed under the_ License" const std::string is_lecensed_str = _utf8(L("is licensed under the")); const std::string license_str = _utf8(L("GNU Affero General Public License, version 3")); - const std::string based_on_str = _utf8(L("Slic3r contains sizable contributions from Prusa Research. Original work by Alessandro Ranellucci and the RepRap community.")); + const std::string based_on_str = _utf8(L("SuperSlicer is a skinned version of Slic3r, based on PrusaSlicer by Prusa and the original Slic3r by Alessandro Ranellucci & the RepRap community.")); const std::string contributors_str = _utf8(L("Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik, Durand Rémi and numerous others.")); const std::string manual_str = _utf8(L("Manual by Gary Hodgson. Inspired by the RepRap community.")); const std::string icon_str = _utf8(L("Slic3r logo designed by Corey Daniels.")); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index cbfecff389b..a0eed7c7301 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -261,7 +261,7 @@ class SplashScreen : public wxSplashScreen version = _L("Version") + " " + std::string(SLIC3R_VERSION_FULL); // credits infornation - credits = _L("Slic3r contains sizable contributions from Prusa Research. Original work by Alessandro Ranellucci and the RepRap community.") + "\n\n" + + credits = _L("SuperSlicer is a skinned version of Slic3r, based on PrusaSlicer by Prusa and the original Slic3r by Alessandro Ranellucci & the RepRap community.") + "\n\n" + title + " " + _L("is licensed under the") + " " + _L("GNU Affero General Public License, version 3") + "\n\n" + _L("Contributions by Vojtech Bubnik, Enrico Turri, Durand Remi, Oleksandra Iushchenko, Tamas Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others."); From d21ff8ec13a80cb3b01db5fab748681551635724 Mon Sep 17 00:00:00 2001 From: remi durand Date: Wed, 9 Jun 2021 14:37:51 +0200 Subject: [PATCH 16/56] fix ubuntu_debug build script --- .github/workflows/ccpp_ubuntu_debug.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml index 90e64f90a04..2650fed5ea9 100644 --- a/.github/workflows/ccpp_ubuntu_debug.yml +++ b/.github/workflows/ccpp_ubuntu_debug.yml @@ -49,7 +49,7 @@ jobs: run: cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="/home/runner/work/SuperSlicer/SuperSlicer/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 - name: make SuperSlicer working-directory: ./build - run: make SuperSlicer + run: make Slic3r - name: make .mo working-directory: ./build run: make gettext_po_to_mo From 37cb18829e2423cb55f98a144ceea0d9931d2993 Mon Sep 17 00:00:00 2001 From: remi durand Date: Wed, 9 Jun 2021 21:37:53 +0200 Subject: [PATCH 17/56] version 2.3.56.4 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 8453c065c84..47cd7a4a931 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.3") +set(SLIC3R_VERSION_FULL "2.3.56.4") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,3") +set(SLIC3R_RC_VERSION "2,3,56,4") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 18a49e43051270da565de0ba0fe0410f99194657 Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 12 Jun 2021 19:44:56 +0200 Subject: [PATCH 18/56] version 2.3.56.5 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 47cd7a4a931..875056450a1 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.4") +set(SLIC3R_VERSION_FULL "2.3.56.5") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,4") +set(SLIC3R_RC_VERSION "2,3,56,5") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From cf038157946b8a82e3342a9ac9b13d730b385b01 Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 26 Jun 2021 00:04:07 +0200 Subject: [PATCH 19/56] version 2.3.56.6 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 875056450a1..856b69c3ee4 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.5") +set(SLIC3R_VERSION_FULL "2.3.56.6") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,5") +set(SLIC3R_RC_VERSION "2,3,56,6") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 7d6fbab5efa438a1919dd91ab250c72cee9877ed Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 26 Jun 2021 13:55:21 +0200 Subject: [PATCH 20/56] Don't auto-build pull request, as it can create too much clutter to delete. --- .github/workflows/ccpp_mac.yml | 3 --- .github/workflows/ccpp_ubuntu.yml | 3 --- .github/workflows/ccpp_win.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index b8397765b52..fecb8b41eed 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -4,9 +4,6 @@ on: push: branches: - Nigthly - pull_request: - branches: - - '*' jobs: build: diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index 2e09f77bbe9..643013bd0bf 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -4,9 +4,6 @@ on: push: branches: - Nigthly - pull_request: - branches: - - '*' jobs: build: diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 2b7e81d2fd2..c35312e822b 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -4,9 +4,6 @@ on: push: branches: - Nigthly - pull_request: - branches: - - '*' jobs: build_dep: From 3c2be64c5355fead9cb999653d96c2c61e670dcc Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 10 Jul 2021 15:33:17 +0200 Subject: [PATCH 21/56] version 2.3.56.7 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 856b69c3ee4..4101025001e 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.6") +set(SLIC3R_VERSION_FULL "2.3.56.7") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,6") +set(SLIC3R_RC_VERSION "2,3,56,7") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 8ccd441cfc845a0cd8f2031c2b68e4a53b10bac7 Mon Sep 17 00:00:00 2001 From: remi durand Date: Sun, 1 Aug 2021 00:07:24 +0200 Subject: [PATCH 22/56] version 2.3.56.8 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 4101025001e..6590523adb9 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.7") +set(SLIC3R_VERSION_FULL "2.3.56.8") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,7") +set(SLIC3R_RC_VERSION "2,3,56,8") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From dce5421c1c2fb50528cdcbcb904f001c439d3fdc Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 9 Aug 2021 03:04:57 +0200 Subject: [PATCH 23/56] update version to branch 2.3.57 --- version.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.inc b/version.inc index 6590523adb9..8ba146ab7ff 100644 --- a/version.inc +++ b/version.inc @@ -8,10 +8,10 @@ set(SLIC3R_APP_KEY "SuperSlicer") # exe name of the slicer, should be lowercase and valid in all os set(SLIC3R_APP_CMD "superslicer") # versions -set(SLIC3R_VERSION "2.3.56") -set(SLIC3R_VERSION_FULL "2.3.56.8") +set(SLIC3R_VERSION "2.3.57") +set(SLIC3R_VERSION_FULL "2.3.57.0") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,56,8") +set(SLIC3R_RC_VERSION "2,3,57,0") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 32816f76dea50e22b2956d6911c0d659602c4cd1 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 27 Sep 2021 21:49:55 +0200 Subject: [PATCH 24/56] version 2.3.57.1 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 8ba146ab7ff..1c852caf68d 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.0") +set(SLIC3R_VERSION_FULL "2.3.57.1") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,0") +set(SLIC3R_RC_VERSION "2,3,57,1") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From efc2e4fe808aa2a52a8208dadbc0ebc73fb9f3fe Mon Sep 17 00:00:00 2001 From: Merill Date: Thu, 7 Oct 2021 18:19:04 +0200 Subject: [PATCH 25/56] Create SECURITY.md --- SECURITY.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000000..48fbcdc0ac0 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,16 @@ +# Security Policy + +## Supported Versions + +| Version | Supported | +| -------- | ------------------ | +| 2.3.57 | :white_check_mark: | +| 2.3.56 | :white_check_mark: | +| < 2.3.56 | :x: | + +last update 2021/10/7 + +## Reporting a Vulnerability + +If the vulnerability isn't dangerous, open an issue. +If it's dangerous, you can contact me on discord (link should be available [here](https://github.com/supermerill/SuperSlicer/issues/611), at the end) From 37a437d2a6f519d4351e0b63fd0c37a2fda20001 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Fri, 8 Oct 2021 00:06:47 +0300 Subject: [PATCH 26/56] README: point discord link to a particular comment --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a1564dc858c..36a2d5fccea 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://discord.gg/ygBBdRRwJY) - +[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) # SuperSlicer **A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) From 83158cc786b3e4cba9da4a1af5c478dba89abea0 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 7 Oct 2021 22:37:50 +0200 Subject: [PATCH 27/56] Add reddit badge, Update "how to build" to mention the scripts. --- README.md | 2 +- doc/How to build - Linux et al.md | 6 ++++++ doc/How to build - Mac OS.md | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 36a2d5fccea..146d8f75709 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) +[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) [![you can get this shield at shields.io](https://img.shields.io/reddit/subreddit-subscribers/slic3r)](https://reddit.com/r/slic3r) # SuperSlicer **A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) diff --git a/doc/How to build - Linux et al.md b/doc/How to build - Linux et al.md index 1247a4eecdd..5c81bbd5faa 100644 --- a/doc/How to build - Linux et al.md +++ b/doc/How to build - Linux et al.md @@ -34,6 +34,12 @@ git submodule update ## How to build, the easy way +After cloning, execute `sudo ./BuildLinux.sh -u` +And then `./BuildLinux.sh -dsi` +The compiled executable should be in the build/package folder + +## How to build, the guided way + You can follow the [script](https://github.com/supermerill/Slic3r/blob/master/.github/workflows/ccpp_ubuntu.yml) the build server use to create the ubuntu release. You have to execute each command at the right of the 'run: ' tags, in the directory that is at the right of the previous 'working-directory:' tag. diff --git a/doc/How to build - Mac OS.md b/doc/How to build - Mac OS.md index 82d9b31174b..25e14cf4b22 100644 --- a/doc/How to build - Mac OS.md +++ b/doc/How to build - Mac OS.md @@ -24,6 +24,12 @@ and then you have to clone the profiles submodules cd resources/profiles git submodule update ``` + +## How to build, the easy way + +After cloning, execute `./BuildMacOS.sh -i` +The executable & dmg should be somewhere in the build directory. + ### How to build You can follow the [script](https://github.com/supermerill/Slic3r/blob/master/.github/workflows/ccpp_mac.yml) the build server use to create the ubuntu release. From 4ffca2f7921e25a122c0b162c85a0d830819b344 Mon Sep 17 00:00:00 2001 From: Merill Date: Mon, 11 Oct 2021 18:01:29 +0200 Subject: [PATCH 28/56] Update FUNDING.yml add ko-fi option for one-time support --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 78d7851b75c..d7404208b16 100644 --- a/.github/FUNDING.yml +++ b/.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 From f46c98c410f0f140d153f7b94e94b3619d162e14 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 13 Oct 2021 23:37:33 +0200 Subject: [PATCH 29/56] version 2.3.57.2 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 1c852caf68d..4e581b078cd 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.1") +set(SLIC3R_VERSION_FULL "2.3.57.2") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,1") +set(SLIC3R_RC_VERSION "2,3,57,2") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 403d258c1c5d8cc06a1e608ad7b2c0f661829ef0 Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 22 Oct 2021 20:16:32 +0200 Subject: [PATCH 30/56] version 2.3.57.3 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 4e581b078cd..6f1cb53d3b2 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.2") +set(SLIC3R_VERSION_FULL "2.3.57.3") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,2") +set(SLIC3R_RC_VERSION "2,3,57,3") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 15235f2a4ef790e88cda22c102a3ef4a91b378e1 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 27 Oct 2021 23:47:20 +0200 Subject: [PATCH 31/56] version 2.3.57.4 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 6f1cb53d3b2..6d2757ead8e 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.3") +set(SLIC3R_VERSION_FULL "2.3.57.4") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,3") +set(SLIC3R_RC_VERSION "2,3,57,4") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From c8ee9491f6de1d97d05fc9eb0e8ee11c0e089074 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sun, 7 Nov 2021 21:03:31 +0100 Subject: [PATCH 32/56] version 2.3.57.5 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 6d2757ead8e..7265b156c11 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.4") +set(SLIC3R_VERSION_FULL "2.3.57.5") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,4") +set(SLIC3R_RC_VERSION "2,3,57,5") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From a9a7f1bcf606e027fca8251f1ea8b2093980ab8b Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 17 Nov 2021 00:49:11 +0100 Subject: [PATCH 33/56] version 2.3.57.6 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 7265b156c11..882b34446af 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.5") +set(SLIC3R_VERSION_FULL "2.3.57.6") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,5") +set(SLIC3R_RC_VERSION "2,3,57,6") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 616fc2b521c2647de7fdfba0de03fdeb5ce2ac7d Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 3 Dec 2021 14:27:49 +0100 Subject: [PATCH 34/56] Update bug report form & template --- .github/ISSUE_TEMPLATE/bug_report.md | 20 ++++---- .github/ISSUE_TEMPLATE/bug_report_form.yml | 56 ++++++++++++++++++++++ 2 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report_form.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 43e0757196e..56957bec610 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,12 +1,19 @@ --- -name: Bug report -about: Create a report to help us improve +name: Bug report template +about: Old bug report template do modify manually --- -**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 <`Export 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 '...' @@ -14,18 +21,13 @@ Steps to reproduce the behavior: 3. Scroll down to '....' 4. See error -**>> Project File <<** -*Please* upload a ZIP archive containing the project file used when the problem arise. Please export it just before the problem occur. Even if did nothing and there is no object, export it as it contains your current configuration. - -**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. 2.3.55.5], Use `Help->About`_ + - Printer model **Additional context** Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/bug_report_form.yml b/.github/ISSUE_TEMPLATE/bug_report_form.yml new file mode 100644 index 00000000000..6c0a02e8571 --- /dev/null +++ b/.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`->`Export 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 From ab8ace52b40d86f0be7ed2ce4762b6c025dc0bd6 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 4 Dec 2021 02:08:22 +0100 Subject: [PATCH 35/56] version 2.3.57.7 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 882b34446af..06e33b94217 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.6") +set(SLIC3R_VERSION_FULL "2.3.57.7") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,6") +set(SLIC3R_RC_VERSION "2,3,57,7") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 3e9d41ff79292d26c642f6d0306f2e12b3c13a07 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 16 Dec 2021 02:27:33 +0100 Subject: [PATCH 36/56] version 2.3.57.8 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 06e33b94217..3527cf20e1a 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.7") +set(SLIC3R_VERSION_FULL "2.3.57.8") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,7") +set(SLIC3R_RC_VERSION "2,3,57,8") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 4e7222ae30033f46f623dfcf596e1e79f9f704a4 Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 4 Jan 2022 23:08:15 +0100 Subject: [PATCH 37/56] version 2.3.57.9 --- version.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.inc b/version.inc index 3527cf20e1a..bb043b47239 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.3.57") -set(SLIC3R_VERSION_FULL "2.3.57.8") +set(SLIC3R_VERSION_FULL "2.3.57.9") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,57,8") +set(SLIC3R_RC_VERSION "2,3,57,9") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer @@ -20,7 +20,7 @@ set(GCODEVIEWER_APP_KEY "${SLIC3R_APP_KEY}-gcodeviewer") set(GCODEVIEWER_APP_CMD "${SLIC3R_APP_CMD}-gcodeviewer") # string to be added after the SLIC3R_APP_NAME on some places -set(SLIC3R_BASED_ON "a flavored version of Slic3r") +set(SLIC3R_BASED_ON "a flavored version of Slic3r, based on PrusaSlicer") # to get he github repo set(SLIC3R_GITHUB "supermerill/SuperSlicer") # download url From 687d505ef506a6e2fde43599fe5ad02aedcd52fc Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 14 Feb 2022 13:44:08 +0100 Subject: [PATCH 38/56] fix color.ini malformed line --- resources/ui_layout/colors.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/ui_layout/colors.ini b/resources/ui_layout/colors.ini index 64b0fb6374c..2d51b7ffa96 100644 --- a/resources/ui_layout/colors.ini +++ b/resources/ui_layout/colors.ini @@ -19,7 +19,8 @@ Custom = 28CC94 Mixed = 000000 Gui_color_dark = 275cad Gui_color = 296acc -Gui_color_light = 3d83edsplash_screen_editor = cars.jpg +Gui_color_light = 3d83ed +splash_screen_editor = cars.jpg splash_screen_gcodeviewer = prusa-gcodepreview.jpg Gui_plater = 3C3C3C Gui_plater_grid = D0D0D0 From 0004cb93b451d014d8cf0a517d720f50e91f30ef Mon Sep 17 00:00:00 2001 From: Merill Date: Mon, 11 Apr 2022 17:18:18 +0200 Subject: [PATCH 39/56] update issue template (export -> save) --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/bug_report_form.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 56957bec610..ef7b42e9f58 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,7 +11,7 @@ A clear and concise description of what the bug is. A clear and concise description of what you expected to happen. !!>> Project File <`Export project as...`, then zip it & drop it here. +*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** diff --git a/.github/ISSUE_TEMPLATE/bug_report_form.yml b/.github/ISSUE_TEMPLATE/bug_report_form.yml index 6c0a02e8571..4c3872877e6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report_form.yml +++ b/.github/ISSUE_TEMPLATE/bug_report_form.yml @@ -22,7 +22,7 @@ body: 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`->`Export project as...` then zip it & drop it here + `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 '....' From 146673d6f9bdfd102f3d6c3bdd88b5bb704b6e14 Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 26 Apr 2022 10:45:43 +0200 Subject: [PATCH 40/56] test script for arm --- src/slic3r/GUI/ScriptExecutor.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp index 40180e601d2..8de628cb370 100644 --- a/src/slic3r/GUI/ScriptExecutor.cpp +++ b/src/slic3r/GUI/ScriptExecutor.cpp @@ -552,14 +552,14 @@ void ScriptContainer::init(const std::string& tab_key, Tab* tab) m_script_engine.get()->RegisterGlobalFunction("void set_string(string &in, string &in new_val)", WRAP_FN(as_set_string), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("bool as_get_custom_bool(int, string &in, bool &out)", WRAP_FN(as_get_custom_bool), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("void as_set_custom_bool(int, string &in, bool)", WRAP_FN(as_set_custom_bool), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("bool as_get_custom_int(int, string &in, int &out)", WRAP_FN(as_get_custom_int), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("void as_set_custom_int(int, string &in, int)", WRAP_FN(as_set_custom_int), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("bool as_get_custom_float(int, string &in, float &out)", WRAP_FN(as_get_custom_float), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("void as_set_custom_float(int, string &in, float)", WRAP_FN(as_set_custom_float), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("bool as_get_custom_string(int, string &in, string &out)", WRAP_FN(as_get_custom_string), AngelScript::asCALL_GENERIC); - m_script_engine.get()->RegisterGlobalFunction("void as_set_custom_string(int, string &in, string &in)", WRAP_FN(as_set_custom_string), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("bool get_custom_bool(int, string &in, bool &out)", WRAP_FN(as_get_custom_bool), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("void set_custom_bool(int, string &in, bool)", WRAP_FN(as_set_custom_bool), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("bool get_custom_int(int, string &in, int &out)", WRAP_FN(as_get_custom_int), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("void set_custom_int(int, string &in, int)", WRAP_FN(as_set_custom_int), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("bool get_custom_float(int, string &in, float &out)", WRAP_FN(as_get_custom_float), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("void set_custom_float(int, string &in, float)", WRAP_FN(as_set_custom_float), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("bool get_custom_string(int, string &in, string &out)", WRAP_FN(as_get_custom_string), AngelScript::asCALL_GENERIC); + m_script_engine.get()->RegisterGlobalFunction("void set_custom_string(int, string &in, string &in)", WRAP_FN(as_set_custom_string), AngelScript::asCALL_GENERIC); m_script_engine.get()->RegisterGlobalFunction("float get_computed_float(string &in)", WRAP_FN(as_get_computed_float), AngelScript::asCALL_GENERIC); m_script_engine.get()->RegisterGlobalFunction("void back_initial_value(string &in)", WRAP_FN(as_back_initial_value), AngelScript::asCALL_GENERIC); From 48278d1dab9acb918aaa6a4a2e989d833d2de537 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 2 May 2022 12:53:45 +0200 Subject: [PATCH 41/56] little update on readme for nightly --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 146d8f75709..9c16df16eb0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ **A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) 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. +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 the archive name (`nightly_win64` or `SuperSlicer-gtk2.AppImage` or `nightly_macos.dmg`) in the "Artifacts" section in the top right corner. 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. @@ -19,7 +19,7 @@ the [documentation directory](doc/) for information about compilation. ### What are SuperSlicer main features? main new features/differences? * Custom-made generated calibration tests. -* **Ironing** top surface & many new settings to fine-tune the top surface quality, like 'only one perimeter on top'. +* 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. From bda609f284f2bbda98cbe46cee7ef21cdda1781c Mon Sep 17 00:00:00 2001 From: supermerill Date: Sun, 15 May 2022 19:59:47 +0200 Subject: [PATCH 42/56] test macos code signing --- .github/workflows/ccpp_mac_rc.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml index 30862a4293b..f01b412a0e7 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -16,11 +16,32 @@ jobs: ref: 'rc' - name: build deps & slicer run: ./BuildMacOS.sh -i + - name: Codesign executable conf + env: + MACOS_CERTIFICATE: ${{ secrets.MACOS_P12 }} + MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_PASSWD }} + run: | + echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 + security create-keychain -p temp_password build.keychain + security default-keychain -s build.keychain + security unlock-keychain -p temp_password build.keychain + security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign + - name: verify certificate presence + run: security find-identity -v + - name: register codesign + run: | + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k temp_password build.keychain + - name: run codesign on app + run: | + /usr/bin/codesign --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/pack/SuperSlicer/SuperSlicer.app -v - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: - name: rc_macos.tar - path: build/SuperSlicer.tar + name: rc_macos.app + path: build/pack/SuperSlicer/SuperSlicer.app + - name: run codesign on dmg + run: | + /usr/bin/codesign --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/SuperSlicer.dmg -v - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: From fb0cfd9bb411fca4cac738f3ec36cc594e933a8c Mon Sep 17 00:00:00 2001 From: Sascha Date: Mon, 18 Jul 2022 17:04:28 +0300 Subject: [PATCH 43/56] Fixed Download Link of Slicer in the Update Message (#2954) --- src/slic3r/GUI/UpdateDialogs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index e38a2d98d11..ce1cabd5e39 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -26,7 +26,7 @@ namespace GUI { static const char* URL_CHANGELOG = "https://github.com/" SLIC3R_GITHUB "/releases"; static const char* URL_DOWNLOAD = "https://github.com/" SLIC3R_GITHUB "/releases"; -static const char* URL_DEV = "https://github.com/" SLIC3R_GITHUB "/releases/tag/version_%1%"; +static const char* URL_DEV = "https://github.com/" SLIC3R_GITHUB "/releases/tag/%1%"; static const std::string CONFIG_UPDATE_WIKI_URL("https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-PE-1.40-configuration-update"); From c88236c1dcfaaacf292b0822bb97a9c7acef0f3c Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 15 Jul 2022 18:54:11 +0200 Subject: [PATCH 44/56] Fix config loading for brim_offset Added a piece of code into handle_legacy to check for aliases. '.mf3 files won't open 2.4.58.3' #2939 --- src/libslic3r/Format/3mf.cpp | 15 ++++++++------- src/libslic3r/PrintConfig.cpp | 10 ++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp index 2b3be08b25e..653b74991ee 100644 --- a/src/libslic3r/Format/3mf.cpp +++ b/src/libslic3r/Format/3mf.cpp @@ -3350,13 +3350,14 @@ bool _3MF_Exporter::_add_custom_gcode_per_print_z_file_to_archive( mz_zip_archiv //FIXME provide a version of PrusaSlicer that stored the project file (3MF). static void handle_legacy_project_loaded(unsigned int version_project_file, DynamicPrintConfig& config) { - if (! config.has("brim_separation")) { - if (auto *opt_elephant_foot = config.option("first_layer_size_compensation", false); opt_elephant_foot) { - // Conversion from older PrusaSlicer which applied brim separation equal to elephant foot compensation. - auto *opt_brim_separation = config.option("brim_separation", true); - opt_brim_separation->value = opt_elephant_foot->value; - } - } + // SuSi: don't do that. It's hidden behavior. + //if (! config.has("brim_separation")) { + // if (auto *opt_elephant_foot = config.option("first_layer_size_compensation", false); opt_elephant_foot) { + // // Conversion from older PrusaSlicer which applied brim separation equal to elephant foot compensation. + // auto *opt_brim_separation = config.option("brim_separation", true); + // opt_brim_separation->value = -opt_elephant_foot->value; + // } + //} } bool is_project_3mf(const std::string& filename) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 4f0731fb383..5513f7f94ef 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -6978,6 +6978,16 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va } if (! print_config_def.has(opt_key)) { + //check the aliases + for(const auto& entry : print_config_def.options) { + for (const std::string& alias : entry.second.aliases) { + if (alias == opt_key) { + // translate + opt_key = entry.first; + return; + } + } + } opt_key = ""; return; } From 04caa6b9d42f44dd8a69691b945db5a21e5ea4ee Mon Sep 17 00:00:00 2001 From: Lukas1818 <44570204+Lukas1818@users.noreply.github.com> Date: Thu, 6 Jan 2022 16:00:21 +0100 Subject: [PATCH 45/56] add "in repo" badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c16df16eb0..7f44a4619cc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) [![you can get this shield at shields.io](https://img.shields.io/reddit/subreddit-subscribers/slic3r)](https://reddit.com/r/slic3r) +[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) [![you can get this shield at shields.io](https://img.shields.io/reddit/subreddit-subscribers/slic3r)](https://reddit.com/r/slic3r) [![Packaging status](https://repology.org/badge/tiny-repos/superslicer.svg)](https://repology.org/project/superslicer/versions) # SuperSlicer **A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) From ef8a47de149fa5915876c0ea19e97945a5d122f5 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sun, 13 Feb 2022 20:07:07 +0100 Subject: [PATCH 46/56] change release names --- create_release.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/create_release.py b/create_release.py index ea672617994..9d9a16e28db 100644 --- a/create_release.py +++ b/create_release.py @@ -80,7 +80,7 @@ def get_version(): found_linux_appimage_gtk2 = True; print("ask for: "+entry["archive_download_url"]); resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); - print("appimage: " +str(resp)); + print("gtk2 appimage: " +str(resp)); z = zipfile.ZipFile(io.BytesIO(resp.content)); z.extractall(release_path); os.rename(release_path+"/"+program_name+"_ubu64.AppImage", release_path+"/"+program_name+"-ubuntu_18.04-gtk2-" + version + ".AppImage"); @@ -88,7 +88,7 @@ def get_version(): found_linux_appimage_gtk3 = True; print("ask for: "+entry["archive_download_url"]); resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); - print("appimage: " +str(resp)); + print("gtk3 appimage: " +str(resp)); z = zipfile.ZipFile(io.BytesIO(resp.content)); z.extractall(release_path); os.rename(release_path+"/"+program_name+"_ubu64.AppImage", release_path+"/"+program_name+"-ubuntu_18.04-" + version + ".AppImage"); @@ -96,7 +96,7 @@ def get_version(): found_linux = True; print("ask for: "+entry["archive_download_url"]); resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); - print("appimage: " +str(resp)); + print("gtk3 archive: " +str(resp)); z = zipfile.ZipFile(io.BytesIO(resp.content)); z.extractall(release_path); base_path = release_path+"/"+program_name+"_" + version + "_linux64_" + date_str; From 107915dbe1f32c801f66d0f1508fb58cd1178b92 Mon Sep 17 00:00:00 2001 From: Merill Date: Wed, 9 Feb 2022 00:57:20 +0100 Subject: [PATCH 47/56] Update badges --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f44a4619cc..970a6aa8751 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ -[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) [![you can get this shield at shields.io](https://img.shields.io/reddit/subreddit-subscribers/slic3r)](https://reddit.com/r/slic3r) [![Packaging status](https://repology.org/badge/tiny-repos/superslicer.svg)](https://repology.org/project/superslicer/versions) +[![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) [![you can get this shield at shields.io](https://img.shields.io/reddit/subreddit-subscribers/slic3r)](https://reddit.com/r/slic3r) [![you can get this shield at shields.io](https://img.shields.io/github/discussions/supermerill/superslicer)](https://github.com/supermerill/SuperSlicer/discussions) + +[![Packaging status](https://repology.org/badge/tiny-repos/superslicer.svg)](https://repology.org/project/superslicer/versions) [![you can get this shield at shields.io](https://img.shields.io/chocolatey/v/superslicer)](https://community.chocolatey.org/packages/superslicer) [![you can get this shield at shields.io](https://img.shields.io/homebrew/cask/v/superslicer)](https://formulae.brew.sh/cask/superslicer) [![you can get this shield at shields.io](https://img.shields.io/aur/version/superslicer)](https://aur.archlinux.org/packages/superslicer) # SuperSlicer **A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) -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. +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. +For **installers**, check the badges above. Windows users can use chocolatey or scoop. 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 the archive name (`nightly_win64` or `SuperSlicer-gtk2.AppImage` or `nightly_macos.dmg`) in the "Artifacts" section in the top right corner. SuperSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code From 11b838cc0ef019b0b90d28fb07e73bf170fba5db Mon Sep 17 00:00:00 2001 From: supermerill Date: Sun, 24 Jul 2022 02:49:03 +0200 Subject: [PATCH 48/56] change version to 2.5.59.0 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index eae0cb15cf8..29dac9c802b 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.4") -set(SLIC3R_VERSION_FULL "2.4.58.3") +set(SLIC3R_VERSION_FULL "2.5.59.0") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,4,58,3") +set(SLIC3R_RC_VERSION "2,5,59,0") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From f0d632cea2784eba1c8d7260fbd5ef009ac59c68 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 30 Jul 2022 03:51:18 +0200 Subject: [PATCH 49/56] fix zstd bundling on macos intel --- .github/workflows/ccpp_mac_rc.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml index f01b412a0e7..51da52c4897 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -4,6 +4,7 @@ on: push: branches: - rc + - debug_macos jobs: build: @@ -15,11 +16,16 @@ jobs: with: ref: 'rc' - 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/SuperSlicer/SuperSlicer.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/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer - name: Codesign executable conf env: MACOS_CERTIFICATE: ${{ secrets.MACOS_P12 }} MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_PASSWD }} + MACOS_APP: ${{secret.MAC_APP_PWD}} run: | echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 security create-keychain -p temp_password build.keychain @@ -31,9 +37,29 @@ jobs: - name: register codesign run: | security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k temp_password build.keychain + - name: run codesign on exe + run: | + /usr/bin/codesign --options=runtime --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer -v + codesign -vvv --deep --strict ./build/pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer + codesign -dvv ./build/pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer + - name: create the dmg + run: | + hdiutil create -ov -fs HFS+ -volname SuperSlicer -srcfolder "build/pack/SuperSlicer" temp.dmg + hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg + - name: run codesign on the dmg + run: | + /usr/bin/codesign -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" SuperSlicer.dmg -v + codesign -vvv --deep --strict SuperSlicer.dmg + codesign -dvv SuperSlicer.dmg + - name: notarize the dmg + run: | + xcrun altool --notarize-app -f SuperSlicer.dmg --primary-bundle-id org.slic3r.superslicer -u mail@remidurand.fr -p $MACOS_APP + spctl -a -t open --context context:primary-signature -v SuperSlicer.dmg - name: run codesign on app run: | /usr/bin/codesign --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/pack/SuperSlicer/SuperSlicer.app -v + codesign -vvv --deep --strict ./build/pack/SuperSlicer/SuperSlicer.app + codesign -dvv ./build/pack/SuperSlicer/SuperSlicer.app - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: From 3edd7b2e9345054f85623d73efaba46b9e737ca6 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 8 Aug 2022 00:33:36 +0200 Subject: [PATCH 50/56] update mac intel build to include zstd --- .github/workflows/ccpp_mac.yml | 18 +++++++++++++----- .github/workflows/ccpp_mac_debug.yml | 14 +++++++++++--- .github/workflows/ccpp_mac_rc.yml | 7 ++----- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 96307453fb4..b198e85a7fb 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -11,19 +11,27 @@ on: jobs: build: - runs-on: macos-10.15 + 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/upload-artifact@v1.0.0 with: - name: nightly_macos.tar - path: build/SuperSlicer.tar + name: nightly_macos.app + path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: nightly_macos.dmg - path: build/SuperSlicer.dmg + path: ${{ github.event.repository.name }}.dmg diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml index ede4c408301..f43b8296a03 100644 --- a/.github/workflows/ccpp_mac_debug.yml +++ b/.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/upload-artifact@v1.0.0 with: name: nightly_macos.tar - path: build/${{ github.event.repository.name }}.tar + path: ${{ github.event.repository.name }}.tar diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml index 51da52c4897..2e3d904d0d4 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: macos-latest + runs-on: macos-12 steps: - uses: actions/checkout@v2 @@ -25,7 +25,7 @@ jobs: env: MACOS_CERTIFICATE: ${{ secrets.MACOS_P12 }} MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_PASSWD }} - MACOS_APP: ${{secret.MAC_APP_PWD}} + MACOS_APP: ${{ secrets.MAC_APP_PWD }} run: | echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 security create-keychain -p temp_password build.keychain @@ -65,9 +65,6 @@ jobs: with: name: rc_macos.app path: build/pack/SuperSlicer/SuperSlicer.app - - name: run codesign on dmg - run: | - /usr/bin/codesign --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/SuperSlicer.dmg -v - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: From eb55d834fa3a127375ca1dd8534cdface2803a42 Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 6 Jan 2023 11:58:10 +0100 Subject: [PATCH 51/56] version 2.5.59.2 --- version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index c729961deef..0e0a6ca068d 100644 --- a/version.inc +++ b/version.inc @@ -9,9 +9,9 @@ set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_CMD "superslicer") # versions set(SLIC3R_VERSION "2.5.59") -set(SLIC3R_VERSION_FULL "2.5.59.1") +set(SLIC3R_VERSION_FULL "2.5.59.2") set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,5,59,1") +set(SLIC3R_RC_VERSION "2,5,59,2") set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") # Same as the slicer name but for gcodeviewer From 0d058b6710c5cc3791289633c607066a1e8e29e8 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 16 Nov 2023 02:49:44 +0100 Subject: [PATCH 52/56] update profiles to same state as dev --- resources/profiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles b/resources/profiles index 5559a75b7ac..be9eda0bbf9 160000 --- a/resources/profiles +++ b/resources/profiles @@ -1 +1 @@ -Subproject commit 5559a75b7acb14ae0c8c222b3a9c1fa7239a317e +Subproject commit be9eda0bbf93ff217ad03606b0f9843aba145fa8 From bfb73176126c9148e204621de1824dcfd593e5c4 Mon Sep 17 00:00:00 2001 From: LuckyTurtleDev <44570204+LuckyTurtleDev@users.noreply.github.com> Date: Fri, 6 Jan 2023 10:54:59 +0100 Subject: [PATCH 53/56] update arch badge (#3273) superslicer move from aur to community --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 970a6aa8751..6b7231be075 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) [![you can get this shield at shields.io](https://img.shields.io/reddit/subreddit-subscribers/slic3r)](https://reddit.com/r/slic3r) [![you can get this shield at shields.io](https://img.shields.io/github/discussions/supermerill/superslicer)](https://github.com/supermerill/SuperSlicer/discussions) -[![Packaging status](https://repology.org/badge/tiny-repos/superslicer.svg)](https://repology.org/project/superslicer/versions) [![you can get this shield at shields.io](https://img.shields.io/chocolatey/v/superslicer)](https://community.chocolatey.org/packages/superslicer) [![you can get this shield at shields.io](https://img.shields.io/homebrew/cask/v/superslicer)](https://formulae.brew.sh/cask/superslicer) [![you can get this shield at shields.io](https://img.shields.io/aur/version/superslicer)](https://aur.archlinux.org/packages/superslicer) +[![Packaging status](https://repology.org/badge/tiny-repos/superslicer.svg)](https://repology.org/project/superslicer/versions) [![you can get this shield at shields.io](https://img.shields.io/chocolatey/v/superslicer)](https://community.chocolatey.org/packages/superslicer) [![you can get this shield at shields.io](https://img.shields.io/homebrew/cask/v/superslicer)](https://formulae.brew.sh/cask/superslicer) [![you can get this shield at shields.io](https://img.shields.io/archlinux/v/community/x86_64/superslicer)](https://archlinux.org/packages/community/x86_64/superslicer/) # SuperSlicer **A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) From fdb1129d13fdd4efa2f66550b11a8718f29e0184 Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 19 Dec 2023 10:25:50 +0100 Subject: [PATCH 54/56] update Archwiki link on readme supermerill/superslicer#4005 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b7231be075..9387aaddabe 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![you can get this shield at shields.io](https://img.shields.io/discord/771316156203270154?color=7289da&logo=discord&logoColor=white)](https://github.com/supermerill/SuperSlicer/issues/611#issuecomment-907833287) [![you can get this shield at shields.io](https://img.shields.io/reddit/subreddit-subscribers/slic3r)](https://reddit.com/r/slic3r) [![you can get this shield at shields.io](https://img.shields.io/github/discussions/supermerill/superslicer)](https://github.com/supermerill/SuperSlicer/discussions) -[![Packaging status](https://repology.org/badge/tiny-repos/superslicer.svg)](https://repology.org/project/superslicer/versions) [![you can get this shield at shields.io](https://img.shields.io/chocolatey/v/superslicer)](https://community.chocolatey.org/packages/superslicer) [![you can get this shield at shields.io](https://img.shields.io/homebrew/cask/v/superslicer)](https://formulae.brew.sh/cask/superslicer) [![you can get this shield at shields.io](https://img.shields.io/archlinux/v/community/x86_64/superslicer)](https://archlinux.org/packages/community/x86_64/superslicer/) +[![Packaging status](https://repology.org/badge/tiny-repos/superslicer.svg)](https://repology.org/project/superslicer/versions) [![you can get this shield at shields.io](https://img.shields.io/chocolatey/v/superslicer)](https://community.chocolatey.org/packages/superslicer) [![you can get this shield at shields.io](https://img.shields.io/homebrew/cask/v/superslicer)](https://formulae.brew.sh/cask/superslicer) [![you can get this shield at shields.io](https://img.shields.io/archlinux/v/community/x86_64/superslicer)](https://archlinux.org/packages/extra/x86_64/superslicer/) # SuperSlicer **A PrusaSlicer fork (which is a slic3r fork)** (previously Slic3r++) From b165c4be64ca19f87d1b6be1502548fad2d09382 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 14 Feb 2024 15:11:01 +0100 Subject: [PATCH 55/56] revert to unsigned dmg for 2.5 until I have some days to repair everything. --- .github/workflows/ccpp_mac_rc.yml | 53 +++++-------------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml index 43dc2c6ad57..972bf701623 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -9,64 +9,27 @@ on: 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 - name: copy zstd - run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/libzstd.1.dylib + 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/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer - - name: Codesign executable conf - env: - MACOS_CERTIFICATE: ${{ secrets.MACOS_P12 }} - MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_PASSWD }} - MACOS_APP: ${{ secrets.MAC_APP_PWD }} - run: | - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 - security create-keychain -p temp_password build.keychain - security default-keychain -s build.keychain - security unlock-keychain -p temp_password build.keychain - security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign - - name: verify certificate presence - run: security find-identity -v - - name: register codesign - run: | - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k temp_password build.keychain - - name: run codesign on exe - run: | - /usr/bin/codesign --options=runtime --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer -v - codesign -vvv --deep --strict ./build/pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer - codesign -dvv ./build/pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer + 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 SuperSlicer -srcfolder "build/pack/SuperSlicer" temp.dmg - hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg - - name: run codesign on the dmg - run: | - /usr/bin/codesign -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" SuperSlicer.dmg -v - codesign -vvv --deep --strict SuperSlicer.dmg - codesign -dvv SuperSlicer.dmg - - name: notarize the dmg - run: | - xcrun altool --notarize-app -f SuperSlicer.dmg --primary-bundle-id org.slic3r.superslicer -u mail@remidurand.fr -p $MACOS_APP - spctl -a -t open --context context:primary-signature -v SuperSlicer.dmg - - name: run codesign on app - run: | - /usr/bin/codesign --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/pack/SuperSlicer/SuperSlicer.app -v - codesign -vvv --deep --strict ./build/pack/SuperSlicer/SuperSlicer.app - codesign -dvv ./build/pack/SuperSlicer/SuperSlicer.app + 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/upload-artifact@v1.0.0 with: name: rc_macos.app - path: build/pack/SuperSlicer/SuperSlicer.app + path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: rc_macos.dmg - path: build/SuperSlicer.dmg + path: ${{ github.event.repository.name }}.dmg From 2e063e0fcfbf0a397a2a60e183e9ee68fcedb0f4 Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 30 Apr 2024 20:37:09 +0200 Subject: [PATCH 56/56] Fix & optimize windows github builds --- .github/workflows/ccpp_win.yml | 59 ++++++-------- .github/workflows/ccpp_win_debug.yml | 69 ++++++++++++++-- .github/workflows/ccpp_win_deps.yml | 118 +++++++++++++++++++++++++++ .github/workflows/ccpp_win_rc.yml | 58 ++++++------- 4 files changed, 233 insertions(+), 71 deletions(-) create mode 100644 .github/workflows/ccpp_win_deps.yml diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 1bd841de42c..6ede51d046f 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -6,31 +6,11 @@ on: - Nigthly - nightly_dev - nightly_master - - debug_win jobs: - build_dep: - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v3 - - uses: ilammy/msvc-dev-cmd@v1 - - name: mkdir in deps - run: mkdir deps/build - - name: cmake and make deps - working-directory: ./deps/build - run: | - cmake .. -G "Visual Studio 16 2019" -A x64 - msbuild /m ALL_BUILD.vcxproj - - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 - with: - name: deps_win - path: ./deps/build/destdir/ build: runs-on: windows-2019 - needs: build_dep steps: - uses: actions/checkout@v1 @@ -41,19 +21,32 @@ jobs: - 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 - - name: mkdir in deps directory - run: mkdir deps/destdir - - name: download deps - uses: actions/download-artifact@v1 - with: - name: deps_win - path: deps/destdir - - name: echo dir deps - run: dir deps - - name: echo dir deps destdir - run: dir deps/destdir - - name: mkdir - run: mkdir build + - run: mkdir deps/destdir + - name: copy deps + working-directory: ./deps/destdir + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_25/deps_win.zip", "deps_win.zip")' + - name: unzip deps + working-directory: ./deps/destdir + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x deps_win.zip' + - run: dir deps + - run: dir deps/destdir + - run: dir deps/destdir/usr + - run: mkdir msgfmt_bin + - name: copy gettext + working-directory: ./msgfmt_bin + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/gettext/gettext-tools-static-0.18.1.1.zip", "gettext.zip")' + - name: unzip + working-directory: ./msgfmt_bin + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x gettext.zip' + - name: add msgfmt to path + shell: powershell + working-directory: msgfmt_bin + run: echo "$pwd;" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - run: mkdir build - name: cmake working-directory: ./build run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\destdir\usr\local" diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml index 73c10012627..fe6abf9cb46 100644 --- a/.github/workflows/ccpp_win_debug.yml +++ b/.github/workflows/ccpp_win_debug.yml @@ -6,8 +6,55 @@ on: - debug_win jobs: + + build_pot: + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v1 + - uses: ilammy/msvc-dev-cmd@v1 + - name: update submodule profiles + working-directory: ./resources/profiles + run: git submodule update --init + - run: mkdir deps/destdir + - name: copy deps + working-directory: ./deps/destdir + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_25/deps_win.zip", "deps_win.zip")' + - name: unzip deps + working-directory: ./deps/destdir + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x deps_win.zip' + - run: dir deps + - run: dir deps/destdir + - run: dir deps/destdir/usr + - run: mkdir msgfmt_bin + - name: copy gettext + working-directory: ./msgfmt_bin + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/gettext/gettext-tools-static-0.18.1.1.zip", "gettext.zip")' + - name: unzip + working-directory: ./msgfmt_bin + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x gettext.zip' + - name: add msgfmt to path + shell: powershell + working-directory: msgfmt_bin + run: echo "$pwd;" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - run: mkdir build + - name: cmake + working-directory: ./build + run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\destdir\usr\local" + - name: make .mo + working-directory: ./build + run: msbuild /m /P:Configuration=RelWithDebInfo gettext_po_to_mo.vcxproj + - name: make .pot + working-directory: ./build + run: msbuild /m /P:Configuration=RelWithDebInfo gettext_make_pot.vcxproj + build_dep: runs-on: windows-2019 + needs: build_pot steps: - uses: actions/checkout@v2 @@ -47,12 +94,22 @@ jobs: with: name: deps_win path: deps/destdir - - name: echo dir deps - run: dir deps - - name: echo dir deps destdir - run: dir deps/destdir - - name: mkdir - run: mkdir build + - run: dir deps + - run: dir deps/destdir + - run: mkdir msgfmt_bin + - name: copy gettext + working-directory: ./msgfmt_bin + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/gettext/gettext-tools-static-0.18.1.1.zip", "gettext.zip")' + - name: unzip + working-directory: ./msgfmt_bin + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x gettext.zip' + - name: add msgfmt to path + shell: powershell + working-directory: msgfmt_bin + run: echo "$pwd;" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - run: mkdir build - name: cmake working-directory: ./build run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\destdir\usr\local" diff --git a/.github/workflows/ccpp_win_deps.yml b/.github/workflows/ccpp_win_deps.yml new file mode 100644 index 00000000000..9155f24fd8f --- /dev/null +++ b/.github/workflows/ccpp_win_deps.yml @@ -0,0 +1,118 @@ +name: C/C++ dep build windows x64 + +on: + push: + branches: + - debug_win + +jobs: + build_dep: + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v3 + - uses: ilammy/msvc-dev-cmd@v1 + - name: mkdir in deps + run: mkdir deps/build + - name: cmake and make deps + working-directory: ./deps/build + run: | + cmake .. -G "Visual Studio 16 2019" -A x64 + msbuild /m ALL_BUILD.vcxproj + - name: Upload artifact + uses: actions/upload-artifact@v1.0.0 + with: + name: deps_win + path: ./deps/build/destdir/ + + build: + runs-on: windows-2019 + needs: build_dep + + steps: + - uses: actions/checkout@v1 + - uses: ilammy/msvc-dev-cmd@v1 + - name: update submodule profiles + working-directory: ./resources/profiles + run: git submodule update --init + - 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 + - run: mkdir deps/destdir + - name: download deps + uses: actions/download-artifact@v1 + with: + name: deps_win + path: deps/destdir + - run: dir deps + - run: dir deps/destdir + - run: mkdir msgfmt_bin + - name: copy gettext + working-directory: ./msgfmt_bin + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/gettext/gettext-tools-static-0.18.1.1.zip", "gettext.zip")' + - name: unzip + working-directory: ./msgfmt_bin + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x gettext.zip' + - name: add msgfmt to path + shell: powershell + working-directory: msgfmt_bin + run: echo "$pwd;" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - run: mkdir build + - name: cmake + working-directory: ./build + run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\destdir\usr\local" + - name: make + working-directory: ./build + run: msbuild /m /P:Configuration=RelWithDebInfo INSTALL.vcxproj + - name: make .mo + working-directory: ./build + run: msbuild /m /P:Configuration=RelWithDebInfo gettext_po_to_mo.vcxproj + - name: make .pot + working-directory: ./build + run: msbuild /m /P:Configuration=RelWithDebInfo gettext_make_pot.vcxproj + - name: create directory and copy into it + working-directory: ./build + run: ls + - name: create directory and copy into it + working-directory: ./build + shell: powershell + #todo: add the opengl folder + run: mkdir package + - name: copy from release + working-directory: ./build + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/1.75/Slic3r_win_build.zip", "Slic3r_win_build.zip")' + - name: unzip + working-directory: ./build + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x Slic3r_win_build.zip' + - name: copy missing dll content from old release + working-directory: ./build + shell: cmd + run: | + xcopy /RCYIE Slic3r_win_build\*.dll package\ + xcopy /RCYIE Slic3r_win_build\local-settings.bat package\${{ github.event.repository.name }}_local-settings.bat + xcopy /RCYIE Slic3r_win_build\mesa package\ + - name: copy new resources + working-directory: ./build + shell: cmd + run: xcopy /RCYIE ..\resources package\resources + - name: copy dll & exe + working-directory: ./build + shell: cmd + run: | + xcopy /RCYIE src\RelWithDebInfo\*.dll package\ + xcopy /RCYIE src\RelWithDebInfo\*.exe package\ + xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\ + del package\opengl32.dll +# - name: create zip +# working-directory: ./build +# shell: cmd +# run: '"C:/Program Files/7-Zip/7z.exe" a -tzip nightly.zip *' + - name: Upload artifact + uses: actions/upload-artifact@v1.0.0 + with: + name: nightly_win64 + path: build/package/ diff --git a/.github/workflows/ccpp_win_rc.yml b/.github/workflows/ccpp_win_rc.yml index 56a3968754f..c94d8ec5538 100644 --- a/.github/workflows/ccpp_win_rc.yml +++ b/.github/workflows/ccpp_win_rc.yml @@ -9,27 +9,8 @@ jobs: build_dep: runs-on: windows-2019 - steps: - - uses: actions/checkout@v2 - with: - ref: 'rc' - - uses: ilammy/msvc-dev-cmd@v1 - - name: mkdir in deps - run: mkdir deps/build - - name: cmake and make deps - working-directory: ./deps/build - run: | - cmake .. -G "Visual Studio 16 2019" -A x64 - msbuild /m ALL_BUILD.vcxproj - - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 - with: - name: deps_win - path: ./deps/build/destdir/ - build: runs-on: windows-2019 - needs: build_dep steps: - uses: actions/checkout@v1 @@ -40,19 +21,32 @@ jobs: - name: change date in version shell: powershell run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("")} | Set-Content version.inc - - name: mkdir in deps directory - run: mkdir deps/destdir - - name: download deps - uses: actions/download-artifact@v1 - with: - name: deps_win - path: deps/destdir - - name: echo dir deps - run: dir deps - - name: echo dir deps destdir - run: dir deps/destdir - - name: mkdir - run: mkdir build + - run: mkdir deps/destdir + - name: copy deps + working-directory: ./deps/destdir + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_25/deps_win.zip", "deps_win.zip")' + - name: unzip deps + working-directory: ./deps/destdir + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x deps_win.zip' + - run: dir deps + - run: dir deps/destdir + - run: dir deps/destdir/usr + - run: mkdir msgfmt_bin + - name: copy gettext + working-directory: ./msgfmt_bin + shell: powershell + run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/gettext/gettext-tools-static-0.18.1.1.zip", "gettext.zip")' + - name: unzip + working-directory: ./msgfmt_bin + shell: cmd + run: '"C:/Program Files/7-Zip/7z.exe" x gettext.zip' + - name: add msgfmt to path + shell: powershell + working-directory: msgfmt_bin + run: echo "$pwd;" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - run: mkdir build - name: cmake working-directory: ./build run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\destdir\usr\local"