Merge branch 'master' into external_perimeter_fan_speed

prusa3d · Aug 23, 2023 · 8d544ea · 8d544ea
2 parents 90cd1f8 + c055425
commit 8d544ea
Show file tree

Hide file tree

Showing 398 changed files with 336,168 additions and 221,030 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,6 @@ endif()
 option(SLIC3R_STATIC 			"Compile PrusaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
 option(SLIC3R_GUI    			"Compile PrusaSlicer with GUI components (OpenGL, wxWidgets)" 1)
 option(SLIC3R_FHS               "Assume PrusaSlicer is to be installed in a FHS directory structure" 0)
-option(SLIC3R_WX_STABLE         "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
 option(SLIC3R_PCH               "Use precompiled headers" 1)
 option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
 option(SLIC3R_MSVC_PDB          "Generate PDB files on MSVC in Release mode" 1)

diff --git a/PrusaSlicer.mo b/PrusaSlicer.mo