diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 39a390dddc..3ce1c76f03 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -3,10 +3,7 @@ name: Build Linux
on:
push:
branches:
- - SoftFever
- pull_request:
- branches:
- - SoftFever
+ - main
jobs:
appimage-builder:
diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml
index 5c4d12432f..72af519b5d 100644
--- a/.github/workflows/build_mac_arm64.yml
+++ b/.github/workflows/build_mac_arm64.yml
@@ -3,10 +3,7 @@ name: Build Mac AppleSilicon
on:
push:
branches:
- - SoftFever
- pull_request:
- branches:
- - SoftFever
+ - main
jobs:
build_osx_arm64:
diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml
index bbda6cb52b..04ad784cbb 100644
--- a/.github/workflows/build_mac_x64.yml
+++ b/.github/workflows/build_mac_x64.yml
@@ -3,10 +3,7 @@ name: Build Mac Intel
on:
push:
branches:
- - SoftFever
- pull_request:
- branches:
- - SoftFever
+ - main
jobs:
build_osx_x86_64:
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
index e2b6eac5d1..5e1d567212 100644
--- a/.github/workflows/build_win.yml
+++ b/.github/workflows/build_win.yml
@@ -3,10 +3,7 @@ name: Build Win64
on:
push:
branches:
- - SoftFever
- pull_request:
- branches:
- - SoftFever
+ - main
jobs:
build_win64:
diff --git a/resources/images/BambuStudio.ico b/resources/images/BambuStudio.ico
index de11c58918..c6d127efd7 100644
Binary files a/resources/images/BambuStudio.ico and b/resources/images/BambuStudio.ico differ
diff --git a/resources/images/OrcaSlicer_gradient_circle.svg b/resources/images/OrcaSlicer_gradient_circle.svg
new file mode 100644
index 0000000000..adcb8839c1
--- /dev/null
+++ b/resources/images/OrcaSlicer_gradient_circle.svg
@@ -0,0 +1,282 @@
+
+
+
+
diff --git a/resources/images/splash_logo.svg b/resources/images/splash_logo.svg
index 34fe2bcfc7..b2c46d628d 100644
--- a/resources/images/splash_logo.svg
+++ b/resources/images/splash_logo.svg
@@ -7,7 +7,7 @@
width="814.987"
height="1023.9927"
viewBox="0 0 814.987 1023.9927"
- sodipodi:docname="OrcaSlicer_gradient_narrow.svg"
+ sodipodi:docname="splash_logo.svg"
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -22,6 +22,42 @@
d="M 0,792 H 612 V 0 H 0 Z"
id="path14" />
+
+
+
+
+
+
+
+ transform="translate(1.2589521,16.062441)"
+ style="filter:url(#filter398)">
diff --git a/src/.doxygen b/src/.doxygen
index 18b61b82f7..f822282e40 100644
--- a/src/.doxygen
+++ b/src/.doxygen
@@ -42,33 +42,33 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.
-PROJECT_NAME = "BambuStudio SoftFever"
+PROJECT_NAME = OrcaSlicer
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.3.2
+PROJECT_NUMBER = 1.5.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
# quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF = "BambuStudio SoftFever"
+PROJECT_BRIEF = OrcaSlicer
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
# in the documentation. The maximum height of the logo should not exceed 55
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.
-PROJECT_LOGO =
+PROJECT_LOGO = D:/a/OrcaSlicer/OrcaSlicer/resources/images/BambuStudio.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = dev-doc
+OUTPUT_DIRECTORY = OrcaSlicer-doc
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
# sub-directories (in 2 levels) under the output directory of each output format
@@ -908,7 +908,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
-INPUT =
+INPUT = .
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1219,6 +1219,46 @@ USE_HTAGS = YES
VERBATIM_HEADERS = YES
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then doxygen will add the directory of each input to the
+# include path.
+# The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_ADD_INC_PATHS = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH =
+
#---------------------------------------------------------------------------
# Configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
@@ -2223,6 +2263,10 @@ DOCBOOK_OUTPUT = docbook
GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# Configuration options related to Sqlite3 output
+#---------------------------------------------------------------------------
+
#---------------------------------------------------------------------------
# Configuration options related to the Perl module output
#---------------------------------------------------------------------------
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 67a53958dc..c4a77ae752 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -1735,8 +1735,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
pts->values.emplace_back(unscale(pt) - Vec2d(print.get_plate_origin().x(), print.get_plate_origin().y()));
BoundingBoxf bbox(pts->values);
m_placeholder_parser.set("first_layer_print_convex_hull", pts.release());
- m_placeholder_parser.set("first_layer_print_min", new ConfigOptionFloats({bbox.min.x() - plate_offset.x(), bbox.min.y() - plate_offset.y()}));
- m_placeholder_parser.set("first_layer_print_max", new ConfigOptionFloats({bbox.max.x() - plate_offset.x(), bbox.max.y() - plate_offset.y()}));
+ m_placeholder_parser.set("first_layer_print_min", new ConfigOptionFloats({bbox.min.x(), bbox.min.y()}));
+ m_placeholder_parser.set("first_layer_print_max", new ConfigOptionFloats({bbox.max.x(), bbox.max.y()}));
m_placeholder_parser.set("first_layer_print_size", new ConfigOptionFloats({ bbox.size().x(), bbox.size().y() }));
}
float outer_wall_volumetric_speed = 0.0f;