Merge branch 'main' into feature/wipetower2_travel_path

Smooth out the spiral lift when arc fitting is disabled (#15118 )
The linear approximation used a heuristic segment count clamped to 4..16, so the lift ran as a coarse polygon. Every vertex is a direction change large enough to hit the firmware's jerk limit, forcing a decelerate/accelerate at each corner — the lift micro-stutters instead of running at speed. The segment count now comes from the chord deviation against the slicing resolution, reusing Geometry::ArcWelder::arc_discretization_steps, which keeps the turn at each vertex shallow enough for the firmware to carry speed through the whole move. Points are emitted through GCodeG1Formatter so they carry the same quantization as the rest of the G-code, and the move comment now trails the feedrate line to match _travel_to_z and the G2/G3 branch. No change when arc fitting is enabled.
2026-08-04 23:08:50 +03:00 · 2026-08-05 00:11:07 +08:00 · 2026-08-05 00:09:46 +08:00 · 2026-08-04 11:37:05 -03:00 · 2026-08-04 22:01:45 +08:00 · 2026-08-04 21:56:15 +08:00
269 changed files with 12328 additions and 1883 deletions
--- a/.github/workflows/update-translation.yml
+++ b/.github/workflows/update-translation.yml
@@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v7

      - name: Setup Python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: '3.12'

--- a/CMakeLists.txt
+++ b/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)
--- a/deps/OpenSSL/OpenSSL.cmake
+++ b/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
--- a/deps_src/imgui/imstb_textedit.h
+++ b/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;
--- a/localization/i18n/tr/OrcaSlicer_tr.po
+++ b/localization/i18n/tr/OrcaSlicer_tr.po
--- a/resources/profiles/Custom.json
+++ b/resources/profiles/Custom.json
@@ -1,6 +1,6 @@
 {
 	"name": "Custom Printer",
-	"version": "02.04.00.01",
+	"version": "02.04.00.03",
 	"force_update": "0",
 	"description": "My configurations",
 	"machine_model_list": [
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -24,12 +24,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/filament/Generic
+++ b/resources/profiles/Custom/filament/Generic
@@ -25,12 +25,6 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_flow": [
-		"40"
-	],
 	"filament_stamping_distance": [
 		"45"
 	],
--- a/resources/profiles/Custom/machine/fdm_klipper_common.json
+++ b/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": "",
--- a/resources/profiles/Custom/machine/fdm_repetier_common.json
+++ b/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": "",
--- a/resources/profiles/Custom/machine/fdm_rrf_common.json
+++ b/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": "",
--- a/resources/profiles/Custom/machine/fdm_toolchanger_common.json
+++ b/resources/profiles/Custom/machine/fdm_toolchanger_common.json
@@ -6,6 +6,7 @@
 	"instantiation": "false",
 	"gcode_flavor": "klipper",
 	"single_extruder_multi_material": "0",
+	"wait_for_temp_on_wipe_tower": "1",
 	"default_filament_profile": [
 		"Generic PLA @MyToolChanger"
 	],
@@ -172,11 +173,11 @@
 		"0.4"
 	],
 	"z_hop_types": [
-		"Normal Lift",
-		"Normal Lift",
-		"Normal Lift",
-		"Normal Lift",
-		"Normal Lift"
+		"Slope Lift",
+		"Slope Lift",
+		"Slope Lift",
+		"Slope Lift",
+		"Slope Lift"
 	],
 	"purge_in_prime_tower": "0",
 	"machine_pause_gcode": "M601",
--- a/resources/profiles/OrcaFilamentLibrary.json
+++ b/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": [
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
@@ -36,6 +36,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_type": [
 		"PET-CF"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
@@ -39,6 +39,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
@@ -39,6 +39,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
@@ -21,6 +21,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_type": [
 		"PLA-AERO"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
@@ -27,6 +27,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_scarf_seam_type": [
 		"none"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu
@@ -21,6 +21,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX
+++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX
@@ -36,6 +36,9 @@
 	"filament_max_volumetric_speed": [
 		"1"
 	],
+	"filament_multitool_ramming_flow": [
+		"1"
+	],
 	"filament_retraction_minimum_travel": [
 		"3"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
@@ -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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
@@ -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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
@@ -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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas
@@ -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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo
@@ -24,6 +24,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"nozzle_temperature": [
 		"290"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo
@@ -35,6 +35,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"Elegoo"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo
@@ -12,6 +12,9 @@
 	"filament_max_volumetric_speed": [
 		"10"
 	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
 	"nozzle_temperature": [
 		"220"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas
@@ -44,5 +44,8 @@
 	],
 	"filament_max_volumetric_speed": [
 		"10"
+	],
+	"filament_multitool_ramming_flow": [
+		"10"
 	]
 }
--- a/resources/profiles/OrcaFilamentLibrary/filament/Eolas
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas
@@ -44,5 +44,8 @@
 	],
 	"filament_max_volumetric_speed": [
 		"8"
+	],
+	"filament_multitool_ramming_flow": [
+		"8"
 	]
 }
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic
@@ -10,5 +10,8 @@
 	"filament_type": [
 		"PA-CF"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"compatible_printers": []
 }
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic
@@ -8,5 +8,8 @@
 	"filament_max_volumetric_speed": [
 		"20"
 	],
+	"filament_multitool_ramming_flow": [
+		"20"
+	],
 	"compatible_printers": []
 }
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic
@@ -17,6 +17,9 @@
 	"filament_max_volumetric_speed": [
 		"11.5"
 	],
+	"filament_multitool_ramming_flow": [
+		"13"
+	],
 	"overhang_fan_speed": [
 		"100"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic
@@ -12,6 +12,9 @@
 	"filament_max_volumetric_speed": [
 		"18"
 	],
+	"filament_multitool_ramming_flow": [
+		"25"
+	],
 	"slow_down_layer_time": [
 		"4"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic
@@ -8,6 +8,9 @@
 	"filament_max_volumetric_speed": [
 		"11"
 	],
+	"filament_multitool_ramming_flow": [
+		"11"
+	],
 	"filament_retraction_length": [
 		"0.8"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic
@@ -15,6 +15,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_type": [
 		"PP-CF"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic
@@ -15,6 +15,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_type": [
 		"PP-GF"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture
@@ -17,6 +17,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"Overture"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment
@@ -23,6 +23,9 @@
 	"filament_max_volumetric_speed": [
 		"7.5"
 	],
+	"filament_multitool_ramming_flow": [
+		"7.5"
+	],
 	"filament_vendor": [
 		"Valment"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_abs.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_asa.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_common.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_cope.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_paht.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json
+++ b/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"
 	]
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json
+++ b/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"
 	]
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pps.json
+++ b/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"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pva.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pva.json
@@ -40,6 +40,15 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming": [
+		"0"
+	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
+	"filament_multitool_ramming_volume": [
+		"0.1"
+	],
 	"filament_soluble": [
 		"1"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json
@@ -11,6 +11,9 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
+	"filament_multitool_ramming_flow": [
+		"12"
+	],
 	"filament_type": [
 		"SBS"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_tpu.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_tpu.json
@@ -43,6 +43,15 @@
 	"filament_max_volumetric_speed": [
 		"3.2"
 	],
+	"filament_multitool_ramming": [
+		"0"
+	],
+	"filament_multitool_ramming_flow": [
+		"3.2"
+	],
+	"filament_multitool_ramming_volume": [
+		"0.1"
+	],
 	"filament_retraction_length": [
 		"0.4"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN
@@ -17,6 +17,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"eSUN"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN
@@ -17,6 +17,9 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
+	"filament_multitool_ramming_flow": [
+		"8"
+	],
 	"filament_vendor": [
 		"eSUN"
 	],
--- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN
@@ -21,6 +21,9 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
+	"filament_multitool_ramming_flow": [
+		"6"
+	],
 	"filament_vendor": [
 		"eSUN"
 	],
--- a/resources/profiles/Snapmaker.json
+++ b/resources/profiles/Snapmaker.json
@@ -1,6 +1,6 @@
 {
 	"name": "Snapmaker",
-	"version": "02.04.00.07",
+	"version": "02.04.00.08",
 	"force_update": "0",
 	"description": "Snapmaker configurations",
 	"machine_model_list": [
@@ -426,10 +426,6 @@
 			"name": "0.16 Optimal @Snapmaker U1 (0.4 nozzle)",
 			"sub_path": "process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json"
 		},
-		{
-			"name": "0.20 Bambu Support W @Snapmaker U1 (0.4 nozzle)",
-			"sub_path": "process/0.20 Bambu Support W @Snapmaker U1 (0.4 nozzle).json"
-		},
 		{
 			"name": "0.20 Quality @Snapmaker U1 (0.4 nozzle)",
 			"sub_path": "process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json"
@@ -486,6 +482,66 @@
 			"name": "fdm_process_U1_0.8_common",
 			"sub_path": "process/fdm_process_U1_0.8_common.json"
 		},
+		{
+			"name": "fdm_process_U1_0.06_nozzle_0.2",
+			"sub_path": "process/fdm_process_U1_0.06_nozzle_0.2.json"
+		},
+		{
+			"name": "fdm_process_U1_0.08_nozzle_0.2",
+			"sub_path": "process/fdm_process_U1_0.08_nozzle_0.2.json"
+		},
+		{
+			"name": "fdm_process_U1_0.10_nozzle_0.2",
+			"sub_path": "process/fdm_process_U1_0.10_nozzle_0.2.json"
+		},
+		{
+			"name": "fdm_process_U1_0.12_nozzle_0.2",
+			"sub_path": "process/fdm_process_U1_0.12_nozzle_0.2.json"
+		},
+		{
+			"name": "fdm_process_U1_0.14_nozzle_0.2",
+			"sub_path": "process/fdm_process_U1_0.14_nozzle_0.2.json"
+		},
+		{
+			"name": "fdm_process_U1_0.18_nozzle_0.6",
+			"sub_path": "process/fdm_process_U1_0.18_nozzle_0.6.json"
+		},
+		{
+			"name": "fdm_process_U1_0.24_nozzle_0.6",
+			"sub_path": "process/fdm_process_U1_0.24_nozzle_0.6.json"
+		},
+		{
+			"name": "fdm_process_U1_0.24_nozzle_0.8",
+			"sub_path": "process/fdm_process_U1_0.24_nozzle_0.8.json"
+		},
+		{
+			"name": "fdm_process_U1_0.30_nozzle_0.6",
+			"sub_path": "process/fdm_process_U1_0.30_nozzle_0.6.json"
+		},
+		{
+			"name": "fdm_process_U1_0.32_nozzle_0.8",
+			"sub_path": "process/fdm_process_U1_0.32_nozzle_0.8.json"
+		},
+		{
+			"name": "fdm_process_U1_0.36_nozzle_0.6",
+			"sub_path": "process/fdm_process_U1_0.36_nozzle_0.6.json"
+		},
+		{
+			"name": "fdm_process_U1_0.40_nozzle_0.8",
+			"sub_path": "process/fdm_process_U1_0.40_nozzle_0.8.json"
+		},
+		{
+			"name": "fdm_process_U1_0.42_nozzle_0.6",
+			"sub_path": "process/fdm_process_U1_0.42_nozzle_0.6.json"
+		},
+		{
+			"name": "fdm_process_U1_0.48_nozzle_0.8",
+			"sub_path": "process/fdm_process_U1_0.48_nozzle_0.8.json"
+		},
+		{
+			"name": "fdm_process_U1_0.56_nozzle_0.8",
+			"sub_path": "process/fdm_process_U1_0.56_nozzle_0.8.json"
+		},
 		{
 			"name": "0.06 High Quality @Snapmaker U1 (0.2 nozzle)",
 			"sub_path": "process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json"
@@ -1508,10 +1564,6 @@
 			"name": "Snapmaker PLA Metal @U1",
 			"sub_path": "filament/Snapmaker PLA Metal @U1.json"
 		},
-		{
-			"name": "Snapmaker PLA Silk @U1",
-			"sub_path": "filament/Snapmaker PLA Silk @U1.json"
-		},
 		{
 			"name": "Snapmaker PLA Silk",
 			"sub_path": "filament/Snapmaker PLA Silk.json"
@@ -1671,6 +1723,214 @@
 		{
 			"name": "Snapmaker PLA Matte @U1 base",
 			"sub_path": "filament/Snapmaker PLA Matte @U1 base.json"
+		},
+		{
+			"name": "Polymaker PLA @U1 base",
+			"sub_path": "filament/Polymaker PLA @U1 base.json"
+		},
+		{
+			"name": "Polymaker Silk PLA Family @U1",
+			"sub_path": "filament/Polymaker Silk PLA Family @U1.json"
+		},
+		{
+			"name": "Polymaker Tough PLA Family @U1",
+			"sub_path": "filament/Polymaker Tough PLA Family @U1.json"
+		},
+		{
+			"name": "Snapmaker Breakaway Support For PLA @U1 0.2 nozzle",
+			"sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json"
+		},
+		{
+			"name": "Snapmaker Breakaway Support For PLA @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker Breakaway Support For PLA @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PETG HF @U1 base2",
+			"sub_path": "filament/Snapmaker PETG HF @U1 base2.json"
+		},
+		{
+			"name": "Snapmaker PETG Translucent @U1 base",
+			"sub_path": "filament/Snapmaker PETG Translucent @U1 base.json"
+		},
+		{
+			"name": "Snapmaker PLA Basic @U1 base",
+			"sub_path": "filament/Snapmaker PLA Basic @U1 base.json"
+		},
+		{
+			"name": "Snapmaker PLA Full Spectrum @U1 0.4 nozzle",
+			"sub_path": "filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Glow @U1 base",
+			"sub_path": "filament/Snapmaker PLA Glow @U1 base.json"
+		},
+		{
+			"name": "Snapmaker PLA Matte @U1 base2",
+			"sub_path": "filament/Snapmaker PLA Matte @U1 base2.json"
+		},
+		{
+			"name": "Snapmaker PLA Silk @U1 0.2 nozzle",
+			"sub_path": "filament/Snapmaker PLA Silk @U1 0.2 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Silk @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PLA Silk @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Silk @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PLA Silk @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA SnapSpeed @U1 base2",
+			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 base2.json"
+		},
+		{
+			"name": "Snapmaker PLA Translucent @U1 base",
+			"sub_path": "filament/Snapmaker PLA Translucent @U1 base.json"
+		},
+		{
+			"name": "Snapmaker PLA Wood @U1 0.4 nozzle",
+			"sub_path": "filament/Snapmaker PLA Wood @U1 0.4 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Wood @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PLA Wood @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Wood @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PLA Wood @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA-CF @U1 0.4 nozzle",
+			"sub_path": "filament/Snapmaker PLA-CF @U1 0.4 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA-CF @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PLA-CF @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA-CF @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PLA-CF @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PVA @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PVA @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PVA @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PVA @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker TPU 90A @U1",
+			"sub_path": "filament/Snapmaker TPU 90A @U1.json"
+		},
+		{
+			"name": "Snapmaker TPU 90A @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker TPU 90A @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker TPU 90A @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker TPU 90A @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker TPU 95A HF @U1",
+			"sub_path": "filament/Snapmaker TPU 95A HF @U1.json"
+		},
+		{
+			"name": "Snapmaker TPU 95A HF @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker TPU 95A HF @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Silk @U1",
+			"sub_path": "filament/Snapmaker PLA Silk @U1.json"
+		},
+		{
+			"name": "Polymaker General PLA Family @U1",
+			"sub_path": "filament/Polymaker General PLA Family @U1.json"
+		},
+		{
+			"name": "Snapmaker PETG HF @U1 0.2 nozzle",
+			"sub_path": "filament/Snapmaker PETG HF @U1 0.2 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PETG HF @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PETG HF @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PETG HF @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PETG HF @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PETG Translucent @U1 0.2 nozzle",
+			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PETG Translucent @U1 0.4 nozzle",
+			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PETG Translucent @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PETG Translucent @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Basic @U1",
+			"sub_path": "filament/Snapmaker PLA Basic @U1.json"
+		},
+		{
+			"name": "Snapmaker PLA Glow @U1 0.4 nozzle",
+			"sub_path": "filament/Snapmaker PLA Glow @U1 0.4 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Matte @U1 0.2 nozzle",
+			"sub_path": "filament/Snapmaker PLA Matte @U1 0.2 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Matte @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PLA Matte @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Matte @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PLA Matte @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA SnapSpeed @U1 0.2 nozzle",
+			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA SnapSpeed @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA SnapSpeed @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Translucent @U1 0.2 nozzle",
+			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Translucent @U1 0.4 nozzle",
+			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Translucent @U1 0.6 nozzle",
+			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json"
+		},
+		{
+			"name": "Snapmaker PLA Translucent @U1 0.8 nozzle",
+			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json"
 		}
 	],
 	"machine_list": [
--- a/resources/profiles/Snapmaker/filament/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker
@@ -0,0 +1,32 @@
+{
+	"type": "filament",
+	"name": "Polymaker General PLA Family @U1",
+	"inherits": "Polymaker PLA @U1 base",
+	"from": "system",
+	"setting_id": "thXfSaUkOAKJ50ey",
+	"instantiation": "true",
+	"compatible_printers": [
+		"Snapmaker U1 (0.4 nozzle)"
+	],
+	"enable_pressure_advance": [
+		"0"
+	],
+	"filament_max_volumetric_speed": [
+		"15"
+	],
+	"filament_vendor": [
+		"Polymaker"
+	],
+	"nozzle_temperature_range_high": [
+		"230"
+	],
+	"temperature_vitrification": [
+		"62"
+	],
+	"textured_plate_temp": [
+		"65"
+	],
+	"textured_plate_temp_initial_layer": [
+		"65"
+	]
+}
--- a/resources/profiles/Snapmaker/filament/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker
@@ -0,0 +1,107 @@
+{
+	"type": "filament",
+	"name": "Polymaker PLA @U1 base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "OGFL99",
+	"instantiation": "false",
+	"compatible_printers": [
+		"Snapmaker U1 (0.4 nozzle)"
+	],
+	"activate_air_filtration": [
+		"0"
+	],
+	"chamber_temperatures": [
+		"0"
+	],
+	"complete_print_exhaust_fan_speed": [
+		"70"
+	],
+	"cool_plate_temp": [
+		"35"
+	],
+	"cool_plate_temp_initial_layer": [
+		"35"
+	],
+	"during_print_exhaust_fan_speed": [
+		"70"
+	],
+	"filament_cost": [
+		"20"
+	],
+	"filament_long_retractions_when_cut": [
+		"nil"
+	],
+	"filament_max_volumetric_speed": [
+		"12"
+	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"15"
+	],
+	"filament_retraction_distances_when_cut": [
+		"nil"
+	],
+	"filament_retraction_length": [
+		"nil"
+	],
+	"filament_retraction_speed": [
+		"nil"
+	],
+	"filament_vendor": [
+		"Generic"
+	],
+	"filament_scarf_seam_type": [
+		"none"
+	],
+	"filament_scarf_height": [
+		"10%"
+	],
+	"filament_scarf_gap": [
+		"15%"
+	],
+	"filament_scarf_length": [
+		"10"
+	],
+	"filament_shrink": [
+		"100%"
+	],
+	"hot_plate_temp": [
+		"55"
+	],
+	"hot_plate_temp_initial_layer": [
+		"55"
+	],
+	"nozzle_temperature": [
+		"220"
+	],
+	"overhang_fan_threshold": [
+		"50%"
+	],
+	"supertack_plate_temp": [
+		"45"
+	],
+	"supertack_plate_temp_initial_layer": [
+		"45"
+	],
+	"slow_down_layer_time": [
+		"4"
+	],
+	"slow_down_min_speed": [
+		"10"
+	],
+	"temperature_vitrification": [
+		"45"
+	],
+	"textured_plate_temp": [
+		"55"
+	],
+	"textured_plate_temp_initial_layer": [
+		"55"
+	],
+	"filament_start_gcode": [
+		"; Filament gcode\n"
+	],
+	"filament_end_gcode": [
+		"; filament end gcode\n"
+	]
+}
--- a/resources/profiles/Snapmaker/filament/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker
@@ -0,0 +1,32 @@
+{
+	"type": "filament",
+	"name": "Polymaker Silk PLA Family @U1",
+	"inherits": "Polymaker PLA @U1 base",
+	"from": "system",
+	"setting_id": "h8vIYpXbxFtHPV6e",
+	"instantiation": "true",
+	"compatible_printers": [
+		"Snapmaker U1 (0.4 nozzle)"
+	],
+	"filament_density": [
+		"1.34"
+	],
+	"filament_vendor": [
+		"Polymaker"
+	],
+	"nozzle_temperature": [
+		"230"
+	],
+	"nozzle_temperature_initial_layer": [
+		"230"
+	],
+	"nozzle_temperature_range_high": [
+		"230"
+	],
+	"textured_plate_temp": [
+		"65"
+	],
+	"textured_plate_temp_initial_layer": [
+		"65"
+	]
+}
--- a/resources/profiles/Snapmaker/filament/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker
@@ -0,0 +1,32 @@
+{
+	"type": "filament",
+	"name": "Polymaker Tough PLA Family @U1",
+	"inherits": "Polymaker PLA @U1 base",
+	"from": "system",
+	"setting_id": "d6CC81Es2hp46bto",
+	"instantiation": "true",
+	"compatible_printers": [
+		"Snapmaker U1 (0.4 nozzle)"
+	],
+	"filament_density": [
+		"1.23"
+	],
+	"filament_flow_ratio": [
+		"0.96"
+	],
+	"filament_vendor": [
+		"Polymaker"
+	],
+	"slow_down_layer_time": [
+		"6"
+	],
+	"temperature_vitrification": [
+		"55"
+	],
+	"textured_plate_temp": [
+		"65"
+	],
+	"textured_plate_temp_initial_layer": [
+		"65"
+	]
+}
--- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
@@ -11,7 +11,6 @@
 	"filament_minimal_purge_on_wipe_tower": [
 		"15"
 	],
-
 	"pressure_advance": [
 		"0.05"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
@@ -17,7 +17,6 @@
 	"filament_z_hop": [
 		"0.0"
 	],
-
 	"enable_pressure_advance": [
 		"1"
 	],
--- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
@@ -17,7 +17,6 @@
 	"filament_z_hop": [
 		"0.0"
 	],
-
 	"enable_pressure_advance": [
 		"1"
 	],
--- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon
@@ -17,7 +17,6 @@
 	"supertack_plate_temp_initial_layer": [
 		"70"
 	],
-
 	"pressure_advance": [
 		"0.04"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyLite Dual PLA @0.2 nozzle",
-	"setting_id": "jhmy4YHi9MuL0DWu",
 	"inherits": "PolyLite PLA @0.2 nozzle",
+	"from": "system",
+	"setting_id": "jhmy4YHi9MuL0DWu",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker A250 Dual (0.2 nozzle)",
 		"Snapmaker A250 Dual BKit (0.2 nozzle)",
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyLite J1 PLA @0.2 nozzle",
-	"setting_id": "jFlRSxx0KvN3BOUu",
 	"inherits": "PolyLite PLA @0.2 nozzle",
+	"from": "system",
+	"setting_id": "jFlRSxx0KvN3BOUu",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker J1 (0.2 nozzle)"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyLite J1 PLA",
-	"setting_id": "wcpOTTMyZNPFKyXr",
 	"inherits": "PolyLite PLA @base",
+	"from": "system",
+	"setting_id": "wcpOTTMyZNPFKyXr",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker J1 (0.4 nozzle)",
 		"Snapmaker J1 (0.6 nozzle)",
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -1,4 +1,9 @@
 {
+	"type": "filament",
+	"name": "PolyLite PETG @Base",
+	"inherits": "fdm_filament_petg",
+	"from": "system",
+	"instantiation": "false",
 	"filament_density": [
 		"1.25"
 	],
@@ -18,11 +23,6 @@
 		"0"
 	],
 	"description": "",
-	"inherits": "fdm_filament_petg",
-	"name": "PolyLite PETG @Base",
-	"type": "filament",
-	"instantiation": "false",
-	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -17,7 +17,6 @@
 	"supertack_plate_temp_initial_layer": [
 		"70"
 	],
-
 	"pressure_advance": [
 		"0.05"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -17,7 +17,6 @@
 	"supertack_plate_temp_initial_layer": [
 		"70"
 	],
-
 	"pressure_advance": [
 		"0.05"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyLite PLA @0.2 nozzle",
-	"setting_id": "s9mdMaFca8SHfji9",
 	"inherits": "PolyLite PLA @base",
+	"from": "system",
+	"setting_id": "s9mdMaFca8SHfji9",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker A250 (0.2 nozzle)",
 		"Snapmaker A250 BKit (0.2 nozzle)",
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "false",
 	"name": "PolyLite PLA @base",
-	"filament_id": "1393866034",
 	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "1393866034",
+	"instantiation": "false",
 	"filament_flow_ratio": [
 		"0.95"
 	],
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyTerra Dual PLA @0.2 nozzle",
-	"setting_id": "UQYgjH1uVxf3d2Nv",
 	"inherits": "PolyTerra PLA @0.2 nozzle",
+	"from": "system",
+	"setting_id": "UQYgjH1uVxf3d2Nv",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker A250 Dual (0.2 nozzle)",
 		"Snapmaker A250 Dual BKit (0.2 nozzle)",
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyTerra J1 PLA @0.2 nozzle",
-	"setting_id": "mxKHxGmBZzPLS82O",
 	"inherits": "PolyTerra PLA @0.2 nozzle",
+	"from": "system",
+	"setting_id": "mxKHxGmBZzPLS82O",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker J1 (0.2 nozzle)"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyTerra J1 PLA",
-	"setting_id": "4MZWZX7QPBzxdEGj",
 	"inherits": "PolyTerra PLA @base",
+	"from": "system",
+	"setting_id": "4MZWZX7QPBzxdEGj",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker J1 (0.4 nozzle)",
 		"Snapmaker J1 (0.6 nozzle)",
--- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
+++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"from": "system",
-	"instantiation": "true",
 	"name": "PolyTerra PLA @0.2 nozzle",
-	"setting_id": "6W1ygT08NordBdIW",
 	"inherits": "PolyTerra PLA @base",
+	"from": "system",
+	"setting_id": "6W1ygT08NordBdIW",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker A250 (0.2 nozzle)",
 		"Snapmaker A250 BKit (0.2 nozzle)",
--- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
@@ -1,4 +1,9 @@
 {
+	"type": "filament",
+	"name": "Polymaker HT-PLA @Base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"instantiation": "false",
 	"filament_density": [
 		"1.28"
 	],
@@ -18,11 +23,6 @@
 		"0"
 	],
 	"description": "",
-	"inherits": "fdm_filament_pla",
-	"name": "Polymaker HT-PLA @Base",
-	"type": "filament",
-	"instantiation": "false",
-	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
@@ -1,4 +1,9 @@
 {
+	"type": "filament",
+	"name": "Polymaker HT-PLA-GF @Base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"instantiation": "false",
 	"filament_density": [
 		"1.34"
 	],
@@ -18,11 +23,6 @@
 		"0"
 	],
 	"description": "",
-	"inherits": "fdm_filament_pla",
-	"name": "Polymaker HT-PLA-GF @Base",
-	"type": "filament",
-	"instantiation": "false",
-	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
@@ -1,4 +1,9 @@
 {
+	"type": "filament",
+	"name": "Polymaker PETG @Base",
+	"inherits": "fdm_filament_petg",
+	"from": "system",
+	"instantiation": "false",
 	"filament_density": [
 		"1.3"
 	],
@@ -18,11 +23,6 @@
 		"0"
 	],
 	"description": "",
-	"inherits": "fdm_filament_petg",
-	"name": "Polymaker PETG @Base",
-	"type": "filament",
-	"instantiation": "false",
-	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]
--- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
+++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker
@@ -1,4 +1,9 @@
 {
+	"type": "filament",
+	"name": "Polymaker PLA Pro @Base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"instantiation": "false",
 	"filament_density": [
 		"1.23"
 	],
@@ -18,11 +23,6 @@
 		"0"
 	],
 	"description": "",
-	"inherits": "fdm_filament_pla",
-	"name": "Polymaker PLA Pro @Base",
-	"type": "filament",
-	"instantiation": "false",
-	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]
--- a/resources/profiles/Snapmaker/filament/Snapmaker
+++ b/resources/profiles/Snapmaker/filament/Snapmaker
@@ -7,5 +7,8 @@
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
+	],
+	"filament_retract_length_toolchange": [
+		"5"
 	]
 }
--- a/resources/profiles/Snapmaker/filament/Snapmaker
+++ b/resources/profiles/Snapmaker/filament/Snapmaker
@@ -7,5 +7,8 @@
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
+	],
+	"filament_retract_length_toolchange": [
+		"5"
 	]
 }
--- a/resources/profiles/Snapmaker/filament/Snapmaker
+++ b/resources/profiles/Snapmaker/filament/Snapmaker
@@ -0,0 +1,104 @@
+{
+	"type": "filament",
+	"name": "Snapmaker Breakaway Support For PLA @U1 0.2 nozzle",
+	"inherits": "Snapmaker Breakaway Support @base",
+	"from": "system",
+	"setting_id": "mJoaud6wulT4p8SA",
+	"instantiation": "true",
+	"compatible_printers": [
+		"Snapmaker U1 (0.2 nozzle)"
+	],
+	"filament_type": [
+		"PLA"
+	],
+	"enable_pressure_advance": [
+		"0"
+	],
+	"additional_cooling_fan_speed": [
+		"70"
+	],
+	"close_fan_the_first_x_layers": [
+		"1"
+	],
+	"complete_print_exhaust_fan_speed": [
+		"70"
+	],
+	"during_print_exhaust_fan_speed": [
+		"70"
+	],
+	"fan_max_speed": [
+		"30"
+	],
+	"fan_min_speed": [
+		"20"
+	],
+	"filament_cost": [
+		"69.98"
+	],
+	"filament_density": [
+		"1.3"
+	],
+	"filament_deretraction_speed": [
+		"nil"
+	],
+	"filament_flow_ratio": [
+		"1"
+	],
+	"filament_max_volumetric_speed": [
+		"0.5"
+	],
+	"filament_retract_length_toolchange": [
+		"10"
+	],
+	"filament_retraction_length": [
+		"nil"
+	],
+	"filament_retraction_speed": [
+		"nil"
+	],
+	"hot_plate_temp_initial_layer": [
+		"65"
+	],
+	"nozzle_temperature": [
+		"240"
+	],
+	"nozzle_temperature_initial_layer": [
+		"240"
+	],
+	"nozzle_temperature_range_low": [
+		"190"
+	],
+	"pressure_advance": [
+		"0.2"
+	],
+	"textured_plate_temp": [
+		"65"
+	],
+	"textured_plate_temp_initial_layer": [
+		"65"
+	],
+	"filament_cooling_moves": [
+		"4"
+	],
+	"filament_loading_speed": [
+		"28"
+	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"15"
+	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"5"
+	],
+	"filament_multitool_ramming_volume": [
+		"5"
+	],
+	"filament_unloading_speed": [
+		"90"
+	],
+	"filament_unloading_speed_start": [
+		"100"
+	]
+}
--- a/resources/profiles/Snapmaker/filament/Snapmaker
+++ b/resources/profiles/Snapmaker/filament/Snapmaker
@@ -0,0 +1,104 @@
+{
+	"type": "filament",
+	"name": "Snapmaker Breakaway Support For PLA @U1 0.6 nozzle",
+	"inherits": "Snapmaker Breakaway Support @base",
+	"from": "system",
+	"setting_id": "rKUUREJNhstIU0I2",
+	"instantiation": "true",
+	"compatible_printers": [
+		"Snapmaker U1 (0.6 nozzle)"
+	],
+	"filament_type": [
+		"PLA"
+	],
+	"enable_pressure_advance": [
+		"0"
+	],
+	"filament_cost": [
+		"69.98"
+	],
+	"filament_density": [
+		"1.3"
+	],
+	"filament_flow_ratio": [
+		"0.95"
+	],
+	"hot_plate_temp_initial_layer": [
+		"65"
+	],
+	"nozzle_temperature": [
+		"210"
+	],
+	"nozzle_temperature_initial_layer": [
+		"210"
+	],
+	"nozzle_temperature_range_low": [
+		"190"
+	],
+	"pressure_advance": [
+		"0.02"
+	],
+	"textured_plate_temp": [
+		"65"
+	],
+	"textured_plate_temp_initial_layer": [
+		"65"
+	],
+	"additional_cooling_fan_speed": [
+		"70"
+	],
+	"close_fan_the_first_x_layers": [
+		"1"
+	],
+	"complete_print_exhaust_fan_speed": [
+		"70"
+	],
+	"during_print_exhaust_fan_speed": [
+		"70"
+	],
+	"fan_min_speed": [
+		"100"
+	],
+	"filament_deretraction_speed": [
+		"nil"
+	],
+	"filament_retract_length_toolchange": [
+		"10"
+	],
+	"filament_retraction_length": [
+		"nil"
+	],
+	"filament_retraction_minimum_travel": [
+		"1"
+	],
+	"filament_retraction_speed": [
+		"nil"
+	],
+	"filament_wipe_distance": [
+		"2"
+	],
+	"filament_cooling_moves": [
+		"4"
+	],
+	"filament_loading_speed": [
+		"28"
+	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"15"
+	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"20"
+	],
+	"filament_multitool_ramming_volume": [
+		"5"
+	],
+	"filament_unloading_speed": [
+		"90"
+	],
+	"filament_unloading_speed_start": [
+		"100"
+	]
+}
--- a/resources/profiles/Snapmaker/filament/Snapmaker
+++ b/resources/profiles/Snapmaker/filament/Snapmaker
@@ -0,0 +1,98 @@
+{
+	"type": "filament",
+	"name": "Snapmaker Breakaway Support For PLA @U1 0.8 nozzle",
+	"inherits": "Snapmaker Breakaway Support @base",
+	"from": "system",
+	"setting_id": "hQ8jQ5GKQKGKuPew",
+	"instantiation": "true",
+	"compatible_printers": [
+		"Snapmaker U1 (0.8 nozzle)"
+	],
+	"filament_type": [
+		"PLA"
+	],
+	"enable_pressure_advance": [
+		"0"
+	],
+	"additional_cooling_fan_speed": [
+		"70"
+	],
+	"close_fan_the_first_x_layers": [
+		"1"
+	],
+	"complete_print_exhaust_fan_speed": [
+		"70"
+	],
+	"during_print_exhaust_fan_speed": [
+		"70"
+	],
+	"filament_cost": [
+		"69.98"
+	],
+	"filament_density": [
+		"1.3"
+	],
+	"filament_deretraction_speed": [
+		"nil"
+	],
+	"filament_flow_ratio": [
+		"0.93"
+	],
+	"filament_retract_length_toolchange": [
+		"10"
+	],
+	"filament_retraction_length": [
+		"3"
+	],
+	"filament_retraction_speed": [
+		"nil"
+	],
+	"hot_plate_temp_initial_layer": [
+		"65"
+	],
+	"nozzle_temperature": [
+		"210"
+	],
+	"nozzle_temperature_initial_layer": [
+		"210"
+	],
+	"nozzle_temperature_range_low": [
+		"190"
+	],
+	"pressure_advance": [
+		"0.015"
+	],
+	"textured_plate_temp_initial_layer": [
+		"65"
+	],
+	"filament_cooling_moves": [
+		"4"
+	],
+	"filament_loading_speed": [
+		"28"
+	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"15"
+	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"20"
+	],
+	"filament_multitool_ramming_volume": [
+		"5"
+	],
+	"filament_unloading_speed": [
+		"90"
+	],
+	"filament_unloading_speed_start": [
+		"100"
+	],
+	"fan_min_speed": [
+		"100"
+	],
+	"textured_plate_temp": [
+		"65"
+	]
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
SoftFever	77a64c300a	Merge branch 'main' into feature/wipetower2_travel_path	2026-08-05 00:11:07 +08:00
SoftFever	0051768206	Smooth out the spiral lift when arc fitting is disabled (#15118 ) The linear approximation used a heuristic segment count clamped to 4..16, so the lift ran as a coarse polygon. Every vertex is a direction change large enough to hit the firmware's jerk limit, forcing a decelerate/accelerate at each corner — the lift micro-stutters instead of running at speed. The segment count now comes from the chord deviation against the slicing resolution, reusing Geometry::ArcWelder::arc_discretization_steps, which keeps the turn at each vertex shallow enough for the firmware to carry speed through the whole move. Points are emitted through GCodeG1Formatter so they carry the same quantization as the rest of the G-code, and the move comment now trails the feedrate line to match _travel_to_z and the G2/G3 branch. No change when arc fitting is enabled.	2026-08-05 00:09:46 +08:00
Ian Bassi	1d078e005a	Mouse ear Wiki redirect (#15115 ) Based in https://github.com/OrcaSlicer/OrcaSlicer/pull/15015 and https://github.com/OrcaSlicer/OrcaSlicer_WIKI/pull/323	2026-08-04 11:37:05 -03:00
Kris Austin	82759d3899	fix: make the error dialog caret point at the character it's blaming (#14886 ) * fix: make the error dialog caret point at the character it's blaming Custom G-code parse errors print the offending line with a '^' under the character that broke, positioned with spaces so it only lines up in a fixed-width font. Since v2.3.2 these dialogs rendered entirely in the proportional UI font, so the caret drifted left of its column and landed on unrelated text. Render only the code excerpts (the offending source line and its caret) in the fixed-width face, leaving the surrounding prose in the UI font, and reserve the horizontal scrollbar's height so a long line does not clip. Rename the flag to has_code_excerpts to match what it now means. Fixes #14869 * refactor(GUI): use <code> instead of <tt> for error excerpts wxHTML maps <tt>, <code>, <kbd> and <samp> to the same fixed-width handler, so this renders identically. <code> is the non-deprecated tag and matches what the original code used. * fix(GUI): align the error caret with real spaces, not   The caret line was padded with   so its spaces would survive inline HTML. wxHTML measures every glyph by its font extent, so where the fixed font lacks a U+00A0 glyph the fallback renders it about twice as wide, and the all-  caret line outran the source, drifting the ^ to the right. Wrap the excerpts in a small <excerpt> tag, registered on the dialog's own parser, that switches on wxHTML literal-whitespace mode so the caret uses real spaces that match the source column in any font. It sits inside <code> for the fixed face; <pre> would do both but forces a blank line above it. --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com>	2026-08-04 22:01:45 +08:00
Ian Bassi	59155f26ac	Build Arch Fix (#15107 ) Arch Fix	2026-08-04 21:56:15 +08:00
SoftFever	ee117d009a	Merge branch 'feature/update-toolchanger-profiles' into feature/wipetower2_travel_path	2026-08-04 21:52:55 +08:00
SoftFever	8a95c6d507	format snapmaker profiles	2026-08-04 20:42:52 +08:00
SoftFever	e8e5ce2ba0	set default support type to tree	2026-08-04 18:20:46 +08:00
SoftFever	8d2196d4a6	Refine wipe tower size estimates, fit checks, and travel-path code - Account the SEMM flush-matrix volume in the rib tower size estimate, reading its gate from the plate config: m_print may not have been applied yet on fresh plates or in the CLI. Rectangle output is unchanged. - Drop the brim growth from the printable-area tower check — the mesh bottom already includes the brim, and the pre-slice auto-brim estimate can overshoot the generated brim by several mm, so prints that physically fit hard-errored. Skip the check when no tower will be printed. - Test the rotated tower body polygon in the gap-route early-out; at off-axis angles the body rect's bounding box covers most of the brim ring, defeating the tightening. - Regenerate the wipe tower when it is moved or rotated while wait_for_temp_on_wipe_tower is active: the temperature-wait park bakes a bed-relative side choice into the cached tower gcode, so a re-slice after dragging the tower could park off the bed. Adds a regression test. - Clean up: reuse OozePrevention::_get_temp for the deferred preheat, park and route against the exact printable-area polygon, fold the bed clamp into generate_path_to_wipe_tower, and take ConfigBase in the flush estimators so PartPlate passes the plate config directly.	2026-08-04 13:59:59 +08:00
yw4z	40eab797c6	match em_unit value for on_dpi_change for linux (#15043 ) * Update GUI_Utils.hpp * Update GUI_Utils.hpp	2026-08-04 08:45:31 +08:00
Kiss Lorand	ca7fbfb007	Fix missing overhang wall when no partial counterbore bridge is generated (#15100 )	2026-08-03 18:02:48 -03:00
Mikhail f. Shiryaev	7b404596e9	Add `Skip G-code config block` to exclude the config comments from G-code files (#12455 ) Add feature to skip CONFIG_BLOCK in G-code files	2026-08-03 15:10:01 -03:00
Kris Austin	06ef58bad8	test: replace the disabled convex_hull_2d test (#14892 ) test(libslic3r): replace the disabled convex_hull_2d test, closing #11269 The last "failing libslic3r test" from #11269 was the disabled SCENARIO("2D convex hull of sinking object", "[3mf][.]") in test_3mf.cpp. It checked ModelObject::convex_hull_2d for a sinking object against PrusaSlicer's reference hull, but Orca's convex_hull_2d does not clip geometry below the bed the way PrusaSlicer's its_convex_hull_2d_above does, so the reference never matched. The test also wrote a debug mesh to a hardcoded /tmp path and its comparison loop was inverted. Remove it and add tests/libslic3r/test_model.cpp characterizing convex_hull_2d on non-sinking transforms (identity and scale+offset), where the projected footprint is unambiguous. Homed in a Model test file since it exercises ModelObject, not 3MF.	2026-08-03 22:29:00 +08:00
SoftFever	74c4a7e450	Support printer specific filament profiles in the OrcaFilamentLibrary (#15101 ) * Support printer specific filament profiles in the Orca Filament Library	2026-08-03 22:25:50 +08:00
Noisyfox	dbb991bf07	Fix gizmo being closed after releasing mouse outside the gizmo floating window (#15095 ) * Fix gizmo being closed after releasing mouse outside the gizmo floating window The left up event of a drag started on the gizmo floating window (e.g. selecting text in an input field) and released over the bed was treated as a click on the plate, which deselected the objects and closed the active gizmo. Add the ignore_left_up guard to the plate select branch, matching the deselect branch above. Co-Authored-By: Claude <noreply@anthropic.com> * Fix Emboss gizmo being closed after releasing mouse outside its floating window The Emboss gizmo has its own close-on-click-away handler (on_mouse_change_selection) that was not protected against left up events originating from ImGui windows, so the gizmo was still closed when a drag started on its floating window (e.g. selecting text in the input field) ended over the 3D scene. Expose the canvas's ignore_left_up state to gizmos and skip the close check for such releases. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>	2026-08-03 18:34:15 +08:00
Noisyfox	66d3f3f9c3	imgui: Clamp mouse y-coordinate in multi-line click/drag to text bounds (#15052 ) * imgui: Clamp mouse y-coordinate in multi-line click/drag to text bounds In single-line mode, click and drag already clamped y to the line's y-coordinate so the cursor would continue to follow the x-position when the mouse went off the top or bottom of the text. Multi-line mode did not clamp, so stb_text_locate_coord() would return 0 (above) or n (below), snapping the cursor to the very start or end of text and ignoring the x-coordinate entirely. Now both modes walk the row layout to compute the top of the first row (y_min) and bottom of the last row (y_max, minus half a line height to add tolerance for rounding), then clamp y to that range before passing it to stb_text_locate_coord(). This means dragging or clicking above the text now places the cursor on the first line at the x-coordinate, and dragging/clicking below places it on the last line at the x-coordinate, matching the single-line precedent. * Fix issue that cursor cannot be placed at the last empty line	2026-08-03 18:34:05 +08:00
SoftFever	4303d723a1	Validate the wipe tower against the printable area A tower (grown by its brim) hanging past the printable outline now fails Print::validate like the existing exclusion-area check, instead of slicing silently in the CLI and only warning post-slice in the GUI.	2026-08-03 15:58:36 +08:00
SoftFever	132086933f	Fix wipe tower rotation in the clearance check The pre-generation square was rotated by degrees through the radians API around the bed origin, and the post-slice mesh bottom was never rotated; rotate both around the tower anchor via deg2rad. Exact no-op at angle 0.	2026-08-03 15:58:36 +08:00
SoftFever	4d81f0c181	Clamp gap-entry scrub excursions to the wipe tower margin The dry drag-out and the flat-ironing spiral could leave the margin band no tower envelope accounts for (the ironing area is unbounded user input); truncate them to WIPE_TOWER_MARGIN around the tower outline instead of skipping the scrub.	2026-08-03 15:23:54 +08:00
SoftFever	1e0fb1a0ae	Fix the gap-route early-out to test the tower body, not the brim envelope An approach starting over the first-layer brim ring skipped routing and travelled straight across the printed wall; only starts over the tower body itself may go direct.	2026-08-03 15:22:15 +08:00
SoftFever	72998ddda2	Route wipe tower entries near bed edges and honor the real bed shape Clamp the router's avoid box against the bed shrunk by the routing clearance so a tower near a bed edge still gets a routed entry instead of a straight line across its wall, and test route corners against the real printable outline instead of its bounding box so circular and custom beds reject off-bed corners.	2026-08-03 15:20:36 +08:00
SoftFever	4d421918ef	Harden wait_for_temp_on_wipe_tower parking and temperature deferral Share one wait_for_temp_enabled gate between the tower and append_tcr2 so a SEMM profile carrying the flag keeps its blocking ooze-prevention wait. Park beside the tower on custom polygonal beds via point-in-polygon, clamp the near-side park toward the bed edge before crossing to the far side, and start non-blocking heating at the toolchange when ooze prevention emits nothing so heat-up overlaps the travel.	2026-08-03 15:18:38 +08:00
SoftFever	0f48ad4157	WIP: add wait_for_temp_on_wipe_tower feature	2026-08-03 14:35:48 +08:00
Ryan Hartman	6b5c8af1c8	Pin OpenSSL libdir so the bundled Python finds it (#15047 ) On Linux the bundled CPython silently links the system OpenSSL instead of the one built in deps/, and the dependency build then fails: install: cannot stat 'Modules/_ssl.cpython-312-x86_64-linux-gnu.so': No such file or directory The chain: * OpenSSL's linux-x86_64 target sets multilib=64, so 'make install_sw' installs the static libs to <prefix>/lib64 while every other dependency in the prefix uses <prefix>/lib. * CPython's --with-openssl=<dir> only ever emits -L<dir>/lib. It does not look in lib64, so -lssl resolves to the system OpenSSL. * gcc -shared does not error on unresolved symbols, so the link appears to succeed. _ssl.c was compiled against the bundled 1.1.1w headers, which map SSL_get1_peer_certificate onto the pre-3.0 SSL_get_peer_certificate -- a symbol OpenSSL 3.x removed. The module then fails to import: _ssl failed to import: undefined symbol: SSL_get_peer_certificate Could not build the ssl module! * With no _ssl built, 'make install' cannot stat it and the build stops. Passing --libdir=lib keeps the prefix single-layout, so CPython's -L<dir>/lib finds the bundled static libraries and links against the headers it was compiled with. CMake-based dependencies were unaffected throughout, because CMake's FindOpenSSL searches lib64 on its own; only CPython's autoconf path is sensitive to this. Affects any distribution where OpenSSL selects the lib64 layout, which is the Fedora, openSUSE and Arch families. Debian and Ubuntu are unaffected, which is why CI has not seen it. Verified on Arch (GCC 16.1.1, CMake 4.4.2): the dependency build completes and the bundled interpreter reports the bundled OpenSSL rather than the system one: $ deps/build/OrcaSlicer_dep/usr/local/libpython/bin/python3.12 \ -c 'import ssl; print(ssl.OPENSSL_VERSION)' OpenSSL 1.1.1w 11 Sep 2023 Not verified on macOS or Windows. The flag is accepted by OpenSSL's Configure on all platforms and Darwin targets do not set multilib, so it should be a no-op there, but CI is the check.	2026-08-03 11:03:59 +08:00
yw4z	e72a3a65b2	QOL Continue to capture mouse position while dragging ImGui controls and mouse position goes to outside of window (#14999 ) * Update GLCanvas3D.cpp * support navigation cube * capture events for transform widgets * camera rotation and pan * selection frame * object drag * fix navigation cube stealing drag events * fix lag on navigation cuve * variable layer height * fix plates toolbar scrollbar * Update GLCanvas3D.cpp * Fix issue that mouse button state is wrong in certain macOS mouse events --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com>	2026-08-02 18:59:53 +08:00
Misterff1	1b71835337	Fixed some desktop environments showing title bar on splash screen when running on Wayland (#15019 ) * Remove titlebar from splash screen on Wayland * Broadly check for window decorations and added explanatory description * Fixed hiding title bar on Wayland for all desktop environments * Update format --------- Co-authored-by: noisyfox <timemanager.rick@gmail.com>	2026-08-02 18:58:49 +08:00
Dipl.-Ing. Raoul Rubien, BSc	f9fa1c117f	Define WXINSPECTOR_DISABLE globally to prevent include-order-dependent class layout (#15063 ) fix: define WXINSPECTOR_DISABLE globally to prevent include-order-dependent class layouts	2026-08-02 18:20:35 +08:00
Kiss Lorand	6f3ca7d1b9	Fix preview speeds and time estimates after firmware retract commands (#15066 )	2026-08-02 00:01:19 -03:00
maddavo	13ae3a1c90	Add outer-only mouse ears and align ear radius controls (#15015 ) Improve mouse ear brim controls	2026-08-02 10:54:16 +08:00
Valerii Bokhan	fb36d5e73b	Feature: Smooth Factor for the Hilbert Curve sparse infill (#14969 )	2026-08-01 17:58:04 -03:00
GlauTech	abb2ab8d3f	Update OrcaSlicer_tr.po (#15060 )	2026-08-01 23:26:26 +03:00
SoftFever	97a7eb459f	Set toolchange retraction per filament for Snapmaker U1	2026-08-01 20:39:19 +08:00
SoftFever	9abec76af1	Add per-filament overrides for toolchange retraction	2026-08-01 20:17:50 +08:00
SoftFever	8b67ee0e2f	Update per-material multi-tool ramming to the filament library	2026-08-01 02:39:15 +08:00
SoftFever	7ebcf3e1e5	set precise_outer_wall to 1	2026-08-01 00:05:01 +08:00
SoftFever	d7341e981b	update prime volume	2026-07-31 18:57:22 +08:00
SoftFever	1d30019679	update snapmaker profiles. largely ported for Snapmaker Orca fork	2026-07-31 18:38:25 +08:00