Merge branch 'SoftFever:main' into main

.github/pull_request_template.md

@@ -0,0 +1,21 @@
+# Description
+
+<!--
+> Please provide a summary of the changes made in this PR. Include details such as:
+  > * What issue does this PR address or fix?
+  > * What new features or enhancements does this PR introduce?
+  > * Are there any breaking changes or dependencies that need to be considered?
+-->
+
+# Screenshots/Recordings/Graphs
+
+<!--
+> Please attach relevant screenshots to showcase the UI changes.
+> Please attach images that can help explain the changes.
+-->
+
+## Tests
+
+<!--
+> Please describe the tests that you have conducted to verify the changes made in this PR.
+-->

README.md

@@ -113,21 +113,21 @@ Thank you! :)
     <img src="SoftFever_doc\sponsor_logos\peopoly-standard-logo.png" alt="Peopoly" width="64" height="">
 </a>
 </td> 
-</tr>
-<tr>
-<td> </td>
-</tr>
-<tr>
 <td>
 <a href="https://qidi3d.com/">
     <img src="SoftFever_doc\sponsor_logos\QIDI.png" alt="QIDI" width="64" height="">
 </a>
 </td>
+<td>
+<a href="https://phrozen3d.com/">
+    <img src="SoftFever_doc\sponsor_logos\Phrozen_Logo圓_.png" alt="Phrozen Technology" width="64" height="">
+</a>
+</td>
 </tr>
 </table>
 
 ### 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)

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)

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})