diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000000..65e3a5ff9f --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,21 @@ +# Description + + + +# Screenshots/Recordings/Graphs + + + +## Tests + + diff --git a/README.md b/README.md index 512b78a83e..88bae970bf 100644 --- a/README.md +++ b/README.md @@ -113,21 +113,21 @@ Thank you! :) Peopoly - - - - - QIDI + + + Phrozen Technology + + ### Backers: -Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/wiki/OrcaSlicer-backers-%E2%80%90-28-Oct-2023) +Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/files/14855600/sponsors.csv) Support me [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP) diff --git a/SoftFever_doc/sponsor_logos/Phrozen_Logo圓_.png b/SoftFever_doc/sponsor_logos/Phrozen_Logo圓_.png new file mode 100644 index 0000000000..2bf62bef54 Binary files /dev/null and b/SoftFever_doc/sponsor_logos/Phrozen_Logo圓_.png differ diff --git a/SoftFever_doc/sponsor_logos/QIDI.png b/SoftFever_doc/sponsor_logos/QIDI.png index 4d1b77776f..9b4f8e0ed1 100644 Binary files a/SoftFever_doc/sponsor_logos/QIDI.png and b/SoftFever_doc/sponsor_logos/QIDI.png differ diff --git a/SoftFever_doc/sponsor_logos/peopoly-standard-logo.png b/SoftFever_doc/sponsor_logos/peopoly-standard-logo.png index be51e75bc1..8ad90ab5f9 100644 Binary files a/SoftFever_doc/sponsor_logos/peopoly-standard-logo.png and b/SoftFever_doc/sponsor_logos/peopoly-standard-logo.png differ diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h index d54f581c1d..d177e69572 100644 --- a/src/libslic3r/libslic3r.h +++ b/src/libslic3r/libslic3r.h @@ -76,7 +76,7 @@ static constexpr double INSET_OVERLAP_TOLERANCE = 0.4; //FIXME This is quite a lot. static constexpr double EXTERNAL_INFILL_MARGIN = 3; static constexpr double BRIDGE_INFILL_MARGIN = 1; -static constexpr double WIPE_TOWER_MARGIN = 15.; +static constexpr double WIPE_TOWER_MARGIN = 1.; //FIXME Better to use an inline function with an explicit return type. //inline coord_t scale_(coordf_t v) { return coord_t(floor(v / SCALING_FACTOR + 0.5f)); } #define scale_(val) ((val) / SCALING_FACTOR) diff --git a/version.inc b/version.inc index 69e4c977ae..b219ff3a15 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "0") endif() -set(SoftFever_VERSION "2.0.0") +set(SoftFever_VERSION "2.1.0-dev") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" SoftFever_VERSION_MATCH ${SoftFever_VERSION}) set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})