fix regression after merge

* fixes: memcpy(...) writing to an object of type OrientParams with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess]

* review result: replaces anonymous namespace with static

CMakeLists.txt

@@ -80,8 +80,12 @@ endif()
 
 if (DEFINED BBL_RELEASE_TO_PUBLIC)
     add_compile_definitions("BBL_RELEASE_TO_PUBLIC=${BBL_RELEASE_TO_PUBLIC}")
+    if (BBL_RELEASE_TO_PUBLIC)
+        add_compile_definitions(WXINSPECTOR_DISABLE)
+    endif ()
 else ()
     add_compile_definitions("BBL_RELEASE_TO_PUBLIC=$<CONFIG:Release>")
+    add_compile_definitions("$<$<CONFIG:Release>:WXINSPECTOR_DISABLE>")
 endif ()
 
 find_package(Git)

deps/OpenSSL/OpenSSL.cmake

@@ -52,6 +52,14 @@ ExternalProject_Add(dep_OpenSSL
 	CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch}
         "--openssldir=${DESTDIR}"
         "--prefix=${DESTDIR}"
+        # OpenSSL's linux-x86_64 target sets multilib=64, so it installs to
+        # <prefix>/lib64 while every other dep uses <prefix>/lib. CPython's
+        # --with-openssl only ever emits -L<dir>/lib, so it misses the bundled
+        # static libs and silently links the system OpenSSL instead -- which,
+        # against 1.1.1w headers, leaves _ssl.so with an undefined
+        # SSL_get_peer_certificate (removed in OpenSSL 3.x). Pin libdir so the
+        # prefix stays single-layout.
+        "--libdir=lib"
         ${_cross_comp_prefix_line}
         no-shared
         no-asm

deps_src/imgui/imstb_textedit.h

@@ -465,6 +465,57 @@ static void stb_textedit_click(STB_TEXTEDIT_STRING *str, STB_TexteditState *stat
       STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
       y = r.ymin;
    }
+   else
+   {
+      // In multi-line mode, clamp y to stay within the text vertical bounds.
+      // This lets the click still land at a valid location if the mouse is slightly
+      // above or below the text.
+      StbTexteditRow r;
+      int n = STB_TEXTEDIT_STRINGLEN(str);
+      int i = 0;
+      float base_y = 0, y_min, y_max;
+
+      // Get the first row to establish y_min and start the iteration
+      STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
+      if (r.num_chars <= 0)
+      {
+         state->cursor = 0;
+         state->select_start = state->cursor;
+         state->select_end = state->cursor;
+         state->has_preferred_x = 0;
+         return;
+      }
+      y_min = r.ymin;
+      y_max = base_y + r.ymax;
+      i = r.num_chars;
+      base_y += r.baseline_y_delta;
+
+      // Walk the remaining rows to find the bottom of the last row
+      while (i < n)
+      {
+         STB_TEXTEDIT_LAYOUTROW(&r, str, i);
+         if (r.num_chars <= 0)
+            break;
+         y_max = base_y + r.ymax;
+         i += r.num_chars;
+         base_y += r.baseline_y_delta;
+      }
+
+      // If the text ends with a newline, account for the empty trailing line
+      // so the cursor can be placed on it
+      if (n > 0 && STB_TEXTEDIT_GETCHAR(str, n - 1) == STB_TEXTEDIT_NEWLINE)
+      {
+         STB_TEXTEDIT_LAYOUTROW(&r, str, n);
+         y_max = base_y + r.ymax;
+      }
+
+      // Subtract half the last line height to avoid rounding issues when the mouse
+      // is just barely below the last line (keep cursor on the last line, not after the text)
+      y_max -= (r.ymax - r.ymin) * 0.5f;
+
+      if (y < y_min) y = y_min;
+      if (y > y_max) y = y_max;
+   }
 
    state->cursor = stb_text_locate_coord(str, x, y);
    state->select_start = state->cursor;
@@ -485,6 +536,50 @@ static void stb_textedit_drag(STB_TEXTEDIT_STRING *str, STB_TexteditState *state
       STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
       y = r.ymin;
    }
+   else
+   {
+      // In multi-line mode, clamp y to stay within the text vertical bounds.
+      // This lets the drag keep working if the mouse goes off the top or bottom of the text.
+      StbTexteditRow r;
+      int n = STB_TEXTEDIT_STRINGLEN(str);
+      int i = 0;
+      float base_y = 0, y_min, y_max;
+
+      // Get the first row to establish y_min and start the iteration
+      STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
+      if (r.num_chars <= 0)
+         return;
+      y_min = r.ymin;
+      y_max = base_y + r.ymax;
+      i = r.num_chars;
+      base_y += r.baseline_y_delta;
+
+      // Walk the remaining rows to find the bottom of the last row
+      while (i < n)
+      {
+         STB_TEXTEDIT_LAYOUTROW(&r, str, i);
+         if (r.num_chars <= 0)
+            break;
+         y_max = base_y + r.ymax;
+         i += r.num_chars;
+         base_y += r.baseline_y_delta;
+      }
+
+      // If the text ends with a newline, account for the empty trailing line
+      // so the cursor can be placed on it
+      if (n > 0 && STB_TEXTEDIT_GETCHAR(str, n - 1) == STB_TEXTEDIT_NEWLINE)
+      {
+         STB_TEXTEDIT_LAYOUTROW(&r, str, n);
+         y_max = base_y + r.ymax;
+      }
+
+      // Subtract half the last line height to avoid rounding issues when the mouse
+      // is just barely below the last line (keep cursor on the last line, not after the text)
+      y_max -= (r.ymax - r.ymin) * 0.5f;
+
+      if (y < y_min) y = y_min;
+      if (y > y_max) y = y_max;
+   }
 
    if (state->select_start == state->select_end)
       state->select_start = state->cursor;

resources/profiles/Creality/process/0.08mm SuperDetail @Creality K1 (0.4 nozzle).json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.08mm SuperDetail @Creality K1 Max_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.08mm SuperDetail @Creality K1C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.08mm SuperDetail @Creality K1C_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.08mm SuperDetail @Creality K1Max (0.4 nozzle).json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.08mm SuperDetail @Creality K1_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1 Max_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1 SE 0.4 nozzle.json

@@ -38,7 +38,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1 SE_CFS-C 0.4 nozzle.json

@@ -38,7 +38,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1C_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.16mm Optimal @Creality K1_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json

@@ -128,7 +128,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.20mm Standard @Creality K1 Max_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.20mm Standard @Creality K1 SE 0.4.json

@@ -124,7 +124,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.20mm Standard @Creality K1 SE_CFS-C 0.4 nozzle.json

@@ -38,7 +38,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json

@@ -128,7 +128,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.20mm Standard @Creality K1C_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json

@@ -128,7 +128,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.20mm Standard @Creality K1_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1 Max_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1 SE 0.4 nozzle.json

@@ -38,7 +38,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1 SE_CFS-C 0.4 nozzle.json

@@ -38,7 +38,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1C_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.24mm Draft @Creality K1_CFS-C 0.4 nozzle.json

@@ -39,7 +39,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "1",
 	"enable_support": "0",

resources/profiles/Creality/process/0.30mm Standard @Creality K1 (0.6 nozzle).json

@@ -126,7 +126,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.30mm Standard @Creality K1 SE 0.6 nozzle.json

@@ -38,7 +38,7 @@
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enable_prime_tower": "0",
 	"enable_support": "0",

resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json

@@ -126,7 +126,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.30mm Standard @Creality K1Max (0.6 nozzle).json

@@ -126,7 +126,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.40mm Standard @Creality K1 (0.8 nozzle).json

@@ -126,7 +126,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json

@@ -126,7 +126,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Creality/process/0.40mm Standard @Creality K1Max (0.8 nozzle).json

@@ -126,7 +126,7 @@
 	"detect_narrow_internal_solid_infill": "1",
 	"dont_filter_internal_bridges": "disabled",
 	"elefant_foot_compensation_layers": "1",
-	"enable_arc_fitting": "1",
+	"enable_arc_fitting": "0",
 	"enable_overhang_speed": "1",
 	"enforce_support_layers": "0",
 	"ensure_vertical_shell_thickness": "ensure_all",

resources/profiles/Custom.json

@@ -1,6 +1,6 @@
 {
 	"name": "Custom Printer",
-	"version": "02.04.00.01",
+	"version": "02.04.00.02",
 	"force_update": "0",
 	"description": "My configurations",
 	"machine_model_list": [

resources/profiles/Custom/filament/Generic ABS @MyToolChanger.json

@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic ASA @MyToolChanger.json

@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PA @MyToolChanger.json

@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PA-CF @MyToolChanger.json

@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PC @MyToolChanger.json

@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json

@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json

@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json

@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json

@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/machine/fdm_klipper_common.json

@@ -116,7 +116,7 @@
 	"deretraction_speed": [
 		"30"
 	],
-	"z_hop_types": "Normal Lift",
+	"z_hop_types": "Slope Lift",
 	"silent_mode": "0",
 	"single_extruder_multi_material": "1",
 	"change_filament_gcode": "",

resources/profiles/Custom/machine/fdm_repetier_common.json

@@ -118,7 +118,7 @@
 	"deretraction_speed": [
 		"30"
 	],
-	"z_hop_types": "Normal Lift",
+	"z_hop_types": "Slope Lift",
 	"silent_mode": "0",
 	"single_extruder_multi_material": "1",
 	"change_filament_gcode": "",

resources/profiles/Custom/machine/fdm_rrf_common.json

@@ -116,7 +116,7 @@
 	"deretraction_speed": [
 		"30"
 	],
-	"z_hop_types": "Normal Lift",
+	"z_hop_types": "Slope Lift",
 	"silent_mode": "0",
 	"single_extruder_multi_material": "1",
 	"change_filament_gcode": "",

resources/profiles/Custom/machine/fdm_toolchanger_common.json

@@ -172,11 +172,11 @@
 		"0.4"
 	],
 	"z_hop_types": [
-		"Normal Lift",
+		"Slope Lift",
-		"Normal Lift",
+		"Slope Lift",
-		"Normal Lift",
+		"Slope Lift",
-		"Normal Lift",
+		"Slope Lift",
-		"Normal Lift"
+		"Slope Lift"
 	],
 	"purge_in_prime_tower": "0",
 	"machine_pause_gcode": "M601",

resources/profiles/OrcaFilamentLibrary.json

@@ -1,6 +1,6 @@
 {
 	"name": "OrcaFilamentLibrary",
-	"version": "02.04.00.03",
+	"version": "02.04.00.04",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json

@@ -36,6 +36,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_type": [
 		"PET-CF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json

@@ -39,6 +39,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json

@@ -39,6 +39,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json

@@ -21,6 +21,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_type": [
 		"PLA-AERO"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json

@@ -27,6 +27,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_scarf_seam_type": [
 		"none"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json

@@ -21,6 +21,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],

resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json

@@ -36,6 +36,9 @@
 	"filament_max_volumetric_speed": [
 		"1"
 	],
+	"filament_multitool_ramming_flow": [
+		"1"
+	],
 	"filament_retraction_minimum_travel": [
 		"3"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json

@@ -72,15 +72,6 @@
 	"fan_min_speed": [
 		"10"
 	],
-	"filament_cooling_final_speed": [
-		"0"
-	],
-	"filament_cooling_initial_speed": [
-		"0"
-	],
-	"filament_cooling_moves": [
-		"0"
-	],
 	"filament_cost": [
 		"599"
 	],
@@ -99,30 +90,12 @@
 	"filament_is_support": [
 		"0"
 	],
-	"filament_loading_speed": [
-		"0"
-	],
-	"filament_loading_speed_start": [
-		"0"
-	],
 	"filament_long_retractions_when_cut": [
 		"nil"
 	],
 	"filament_max_volumetric_speed": [
 		"15"
 	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"0"
-	],
-	"filament_multitool_ramming": [
-		"0"
-	],
-	"filament_multitool_ramming_flow": [
-		"10"
-	],
-	"filament_multitool_ramming_volume": [
-		"10"
-	],
 	"filament_notes": [
 		""
 	],
@@ -165,21 +138,6 @@
 	"filament_soluble": [
 		"0"
 	],
-	"filament_stamping_distance": [
-		"0"
-	],
-	"filament_stamping_loading_speed": [
-		"0"
-	],
-	"filament_toolchange_delay": [
-		"0"
-	],
-	"filament_unloading_speed": [
-		"0"
-	],
-	"filament_unloading_speed_start": [
-		"0"
-	],
 	"filament_vendor": [
 		"Elas"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json

@@ -42,15 +42,6 @@
 	"fan_min_speed": [
 		"20"
 	],
-	"filament_cooling_final_speed": [
-		"0"
-	],
-	"filament_cooling_initial_speed": [
-		"0"
-	],
-	"filament_cooling_moves": [
-		"0"
-	],
 	"filament_cost": [
 		"445"
 	],
@@ -69,30 +60,12 @@
 	"filament_is_support": [
 		"0"
 	],
-	"filament_loading_speed": [
-		"0"
-	],
-	"filament_loading_speed_start": [
-		"0"
-	],
 	"filament_long_retractions_when_cut": [
 		"1"
 	],
 	"filament_max_volumetric_speed": [
 		"18"
 	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"0"
-	],
-	"filament_multitool_ramming": [
-		"0"
-	],
-	"filament_multitool_ramming_flow": [
-		"10"
-	],
-	"filament_multitool_ramming_volume": [
-		"10"
-	],
 	"filament_notes": [
 		""
 	],
@@ -135,21 +108,6 @@
 	"filament_soluble": [
 		"0"
 	],
-	"filament_stamping_distance": [
-		"0"
-	],
-	"filament_stamping_loading_speed": [
-		"0"
-	],
-	"filament_toolchange_delay": [
-		"0"
-	],
-	"filament_unloading_speed": [
-		"0"
-	],
-	"filament_unloading_speed_start": [
-		"0"
-	],
 	"filament_wipe": [
 		"nil"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json

@@ -71,15 +71,6 @@
 	"fan_min_speed": [
 		"60"
 	],
-	"filament_cooling_final_speed": [
-		"0"
-	],
-	"filament_cooling_initial_speed": [
-		"0"
-	],
-	"filament_cooling_moves": [
-		"0"
-	],
 	"filament_cost": [
 		"449.5"
 	],
@@ -98,30 +89,12 @@
 	"filament_is_support": [
 		"0"
 	],
-	"filament_loading_speed": [
-		"0"
-	],
-	"filament_loading_speed_start": [
-		"0"
-	],
 	"filament_long_retractions_when_cut": [
 		"nil"
 	],
 	"filament_max_volumetric_speed": [
 		"25"
 	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"0"
-	],
-	"filament_multitool_ramming": [
-		"0"
-	],
-	"filament_multitool_ramming_flow": [
-		"10"
-	],
-	"filament_multitool_ramming_volume": [
-		"10"
-	],
 	"filament_notes": [
 		""
 	],
@@ -164,21 +137,6 @@
 	"filament_soluble": [
 		"0"
 	],
-	"filament_stamping_distance": [
-		"0"
-	],
-	"filament_stamping_loading_speed": [
-		"0"
-	],
-	"filament_toolchange_delay": [
-		"0"
-	],
-	"filament_unloading_speed": [
-		"0"
-	],
-	"filament_unloading_speed_start": [
-		"0"
-	],
 	"filament_vendor": [
 		"Elas"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json

@@ -71,15 +71,6 @@
 	"fan_min_speed": [
 		"100"
 	],
-	"filament_cooling_final_speed": [
-		"0"
-	],
-	"filament_cooling_initial_speed": [
-		"0"
-	],
-	"filament_cooling_moves": [
-		"0"
-	],
 	"filament_cost": [
 		"500"
 	],
@@ -98,30 +89,12 @@
 	"filament_is_support": [
 		"0"
 	],
-	"filament_loading_speed": [
-		"0"
-	],
-	"filament_loading_speed_start": [
-		"0"
-	],
 	"filament_long_retractions_when_cut": [
 		"nil"
 	],
 	"filament_max_volumetric_speed": [
 		"18"
 	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"0"
-	],
-	"filament_multitool_ramming": [
-		"0"
-	],
-	"filament_multitool_ramming_flow": [
-		"10"
-	],
-	"filament_multitool_ramming_volume": [
-		"10"
-	],
 	"filament_notes": [
 		""
 	],
@@ -164,21 +137,6 @@
 	"filament_soluble": [
 		"0"
 	],
-	"filament_stamping_distance": [
-		"0"
-	],
-	"filament_stamping_loading_speed": [
-		"0"
-	],
-	"filament_toolchange_delay": [
-		"0"
-	],
-	"filament_unloading_speed": [
-		"0"
-	],
-	"filament_unloading_speed_start": [
-		"0"
-	],
 	"filament_vendor": [
 		"Elas"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json

@@ -24,6 +24,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"nozzle_temperature": [
 		"290"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @base.json

@@ -35,6 +35,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"Elegoo"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json

@@ -12,6 +12,9 @@
 	"filament_max_volumetric_speed": [
 		"10"
 	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
 	"nozzle_temperature": [
 		"220"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json

@@ -44,5 +44,8 @@
 	],
 	"filament_max_volumetric_speed": [
 		"10"
+	],
+	"filament_multitool_ramming_flow": [
+		"10"
 	]
 }

resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json

@@ -44,5 +44,8 @@
 	],
 	"filament_max_volumetric_speed": [
 		"8"
+	],
+	"filament_multitool_ramming_flow": [
+		"8"
 	]
 }

resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json

@@ -10,5 +10,8 @@
 	"filament_type": [
 		"PA-CF"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json

@@ -8,5 +8,8 @@
 	"filament_max_volumetric_speed": [
 		"20"
 	],
+	"filament_multitool_ramming_flow": [
+		"20"
+	],
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json

@@ -17,6 +17,9 @@
 	"filament_max_volumetric_speed": [
 		"11.5"
 	],
+	"filament_multitool_ramming_flow": [
+		"13"
+	],
 	"overhang_fan_speed": [
 		"100"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json

@@ -12,6 +12,9 @@
 	"filament_max_volumetric_speed": [
 		"18"
 	],
+	"filament_multitool_ramming_flow": [
+		"25"
+	],
 	"slow_down_layer_time": [
 		"4"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json

@@ -8,6 +8,9 @@
 	"filament_max_volumetric_speed": [
 		"11"
 	],
+	"filament_multitool_ramming_flow": [
+		"11"
+	],
 	"filament_retraction_length": [
 		"0.8"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json

@@ -15,6 +15,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_type": [
 		"PP-CF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json

@@ -15,6 +15,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_type": [
 		"PP-GF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json

@@ -17,6 +17,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"Overture"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Silk @base.json

@@ -23,6 +23,9 @@
 	"filament_max_volumetric_speed": [
 		"7.5"
 	],
+	"filament_multitool_ramming_flow": [
+		"7.5"
+	],
 	"filament_vendor": [
 		"Valment"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_abs.json

@@ -43,6 +43,12 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"15"
+	],
+	"filament_multitool_ramming_volume": [
+		"10"
+	],
 	"filament_type": [
 		"ABS"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_asa.json

@@ -43,6 +43,12 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"12"
+	],
+	"filament_multitool_ramming_volume": [
+		"10"
+	],
 	"filament_type": [
 		"ASA"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json

@@ -41,6 +41,15 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming": [
+		"0"
+	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
+	"filament_multitool_ramming_volume": [
+		"0.1"
+	],
 	"filament_type": [
 		"BVOH"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_common.json

@@ -66,6 +66,12 @@
 	"filament_minimal_purge_on_wipe_tower": [
 		"15"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_volume": [
+		"5"
+	],
 	"filament_retract_before_wipe": [
 		"nil"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_cope.json

@@ -41,6 +41,9 @@
 	"filament_max_volumetric_speed": [
 		"16"
 	],
+	"filament_multitool_ramming_flow": [
+		"16"
+	],
 	"filament_scarf_seam_type": [
 		"none"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json

@@ -8,6 +8,9 @@
 	"filament_type": [
 		"EVA"
 	],
+	"filament_multitool_ramming_flow": [
+		"12"
+	],
 	"supertack_plate_temp": [
 		"0"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json

@@ -41,6 +41,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_type": [
 		"HIPS"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json

@@ -44,6 +44,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"12"
+	],
 	"filament_type": [
 		"PA"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_paht.json

@@ -7,6 +7,9 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"12"
+	],
 	"filament_type": [
 		"PAHT"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json

@@ -86,6 +86,9 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"16"
+	],
 	"filament_flow_ratio": [
 		"0.94"
 	]

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json

@@ -26,6 +26,9 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
 	"filament_type": [
 		"PCTG"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json

@@ -38,6 +38,9 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"12"
+	],
 	"filament_type": [
 		"PE"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json

@@ -26,6 +26,9 @@
 	"filament_max_volumetric_speed": [
 		"10"
 	],
+	"filament_multitool_ramming_flow": [
+		"15"
+	],
 	"filament_type": [
 		"PETG"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json

@@ -38,6 +38,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_type": [
 		"PHA"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json

@@ -38,6 +38,9 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"20"
+	],
 	"filament_scarf_seam_type": [
 		"none"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json

@@ -9,6 +9,9 @@
 	"filament_flow_ratio": [
 		"0.98"
 	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
 	"slow_down_layer_time": [
 		"8"
 	]

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json

@@ -38,6 +38,9 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"12"
+	],
 	"filament_type": [
 		"PP"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json

@@ -47,6 +47,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_type": [
 		"PPA-CF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pps.json

@@ -43,6 +43,9 @@
 	"filament_max_volumetric_speed": [
 		"4"
 	],
+	"filament_multitool_ramming_flow": [
+		"4"
+	],
 	"filament_type": [
 		"PPS"
 	],