Merge remote-tracking branch 'remote/master' into SoftFever

# Conflicts: # resources/profiles/BBL/filament/Bambu PC @bbl X1C.json # resources/profiles/BBL/filament/Bambu TPU 95A @bbl X1C.json
SoftFever · Jul 23, 2022 · b806df7 · b806df7
2 parents 9af793a + a363dae
commit b806df7
Show file tree

Hide file tree

Showing 269 changed files with 10,221 additions and 32,121 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,6 +53,7 @@ if (APPLE)
  if (CMAKE_MACOSX_BUNDLE)
  set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
  endif()
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
 endif ()
 
 # Proposal for C++ unit tests and sandboxes

diff --git a/README.md b/README.md
@@ -76,5 +76,5 @@ Slic3r is licensed under the GNU Affero General Public License, version 3. Slic3
 
 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.
 
-The BambuNetworking and BambuTunnel plugins are based on non-free libraries. They are optional to the Bambu Studio and provides extended functionalities for users.
+The bambu networking plugin is based on non-free libraries. It is optional to the Bambu Studio and provides extended functionalities for users.