Merge branch 'master' into bridge_infill_threshold

prusa3d · Mar 31, 2023 · fda0bf7 · fda0bf7
2 parents 8b339ec + 0384d63
commit fda0bf7
Show file tree

Hide file tree

Showing 223 changed files with 15,356 additions and 8,065 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,10 @@
 contact_links:
-  - name: PrusaSlicer Manual and Support
+  - name: Do you need Support?
+    url: https://www.prusa3d.com/page/prusaslicer-support-form_233563/
+    about: If you are not sure whether what you are reporting is a bug, please contact our support team first. We are providing full 24/7 customer support.
+  - name: PrusaSlicer Manual
     url: https://help.prusa3d.com/en/article/customer-support_2287/
-    about: If you are not sure that what you are reporting is really a bug, please, consult the manual first.
+    about: We have a comprehensive customer support page and help documentation that could be helpful for troubleshooting.
   - name: PrusaPrinters Forum
     url: https://forum.prusaprinters.org/forum/prusaslicer/
     about: Please get in touch on our PrusaPrinters Community Forum! (Not an official support channel.)

diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake
@@ -13,8 +13,8 @@ if (UNIX AND NOT APPLE) # wxWidgets will not use char as the underlying type for
 endif()
 
 prusaslicer_add_cmake_project(wxWidgets
-    URL https://github.com/prusa3d/wxWidgets/archive/4fd2120c913c20c3bb66ee9d01d8ff5087a8b90a.zip
-    URL_HASH SHA256=5b59e8b4dccf73e109c6588f6a69bcfe4e02e930af53c43d5d1329c1f3d83ec9
+    URL https://github.com/prusa3d/wxWidgets/archive/0b49beaacce17d90f0c370ecd73221abd089667a.zip
+    URL_HASH SHA256=8fa978a76d6bd811b30eecc5124186b9ad54290b820f3a354e85bfa9dae6a5ce
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG dep_NanoSVG
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON

diff --git a/resources/localization/list.txt b/resources/localization/list.txt
@@ -87,6 +87,7 @@ src/slic3r/GUI/UpdateDialogs.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
 src/slic3r/GUI/wxExtensions.cpp
 src/slic3r/Utils/AstroBox.cpp
+src/slic3r/Utils/AppUpdater.cpp
 src/slic3r/Utils/Duet.cpp
 src/slic3r/Utils/FixModelByWin10.cpp
 src/slic3r/Utils/FlashAir.cpp
@@ -101,6 +102,7 @@ src/libslic3r/ExtrusionEntity.cpp
 src/libslic3r/Flow.cpp
 src/libslic3r/Format/3mf.cpp
 src/libslic3r/Format/AMF.cpp
+src/libslic3r/Format/SLAArchiveReader.cpp
 src/libslic3r/GCode/PostProcessor.cpp
 src/libslic3r/miniz_extension.cpp
 src/libslic3r/Preset.cpp
@@ -113,3 +115,4 @@ src/libslic3r/PrintBase.cpp
 src/libslic3r/PrintConfig.cpp
 src/libslic3r/Zipper.cpp
 src/libslic3r/PrintObject.cpp
+src/libslic3r/PrintObjectSlice.cpp
diff --git a/resources/profiles/Anker.idx b/resources/profiles/Anker.idx
@@ -1,3 +1,5 @@
+min_slic3r_version = 2.6.0-alpha4
+1.1.1 Initial official version
+1.0.1 Initial Version
 min_slic3r_version = 2.6.0-alpha1
-1.0.1 Disabled thick bridges.
 1.0.0 Initial Version