Merge branch 'main' into perf/slicing-optimizations

add missing headers
Co-authored-by: Rodrigo Faselli <162915171+RF47@users.noreply.github.com>
2026-10-14 11:21:18 +00:00 · 2026-10-11 22:39:31 -03:00 · 2026-10-11 22:36:16 -03:00 · 2026-10-11 15:00:58 -03:00 · 2026-10-10 01:09:46 +08:00 · 2026-10-09 22:19:27 +08:00
315 changed files with 1703 additions and 14272 deletions
@@ -62,6 +62,23 @@ Clipper2 behaves differently by default, the wrapper adjusts it.
  clip do not leave slivers.
 - Open polylines are clipped with the non-zero rule and keep their direction.

+### Tiled booleans
+
+The sweep slows down with the number of edges crossing a scan line, so a layer
+cut into thousands of pieces makes every whole-layer boolean expensive.
+`diff_ex_by_piece()` and `intersection_ex_by_piece()` take a subject of
+non-overlapping `ExPolygons`, group them into tiles with
+`ClipperUtils::tile_expolygons()`, and run each tile in parallel against only
+the clip polygons near it, cut to the tile's box. Below 128 pieces there is a
+single tile, and they are the plain `diff_ex()` / `intersection_ex()`.
+
+The result covers the same area as the plain call. Without the safety offset
+the rings are the same. With it, each tile unites only the clip polygons near
+it, so a clip edge that the whole-layer union splits where it crosses a distant
+clip polygon stays whole, and a crossing with the subject can round 1 unit
+differently. The tiles' results are concatenated in tile order, so the order of
+the output `ExPolygons` differs from the plain call.
+
 ### Offsets

 - Before offsetting, input vertices closer than
@@ -1,131 +0,0 @@
-# Tooltip illustrations
-
-The texture-displacement panel's tooltips can carry a picture under their text: a still image, or a
-short animation that loops while the tooltip is open. Several settings in that panel describe a shape
-rather than a number - what Rotation turns, what Tile repeats, what Invert turns inside out - and a
-sentence about a shape is read twice and understood once.
-
-## Where a tooltip is drawn
-
-`GLGizmoTextureDisplacement::panel_tooltip()` replaces `ImGuiWrapper::tooltip()` throughout the panel.
-It differs in two ways.
-
-It places the tooltip beside the panel instead of under the mouse. The panel is pinned to the right
-edge of the canvas, so a tooltip following the mouse covers the control it is explaining, and one
-carrying a picture covers most of the panel with it. The tooltip goes to the left of
-`m_tooltip_anchor_min`/`_max` - the panel's own screen rectangle, or the texture picker's while that
-popup is up and the tooltip comes from inside it - and to the right only when there is no room on the
-left. This is the placement the picker popup itself already uses.
-
-ImGui normally keeps a tooltip glued to the mouse and ignores `SetNextWindowPos()`. Orca's imgui
-branch honours a position set for a tooltip (see the `ImGuiWindowFlags_Tooltip` branch of `Begin()` in
-`deps_src/imgui/imgui.cpp`) and still clamps the result inside the canvas, which is what keeps a tall
-tooltip near the bottom edge on screen.
-
-It also gives the tooltip a fixed width rather than one derived from its text, because a picture has
-to be laid out against something, and a column of tooltips that are all one width is steadier to read.
-
-## Where the pictures live
-
-`resources/images/texture_displacement/`, as PNG, JPG, BMP or GIF. A tooltip names them by file:
-
-```cpp
-hover_tip(_u8L("Repeats the texture across the painted area. ..."),
-          { { "tile_off.png", _L("Off") }, { "tile_on.png", _L("On") } });
-```
-
-Several in one tooltip are laid out side by side at equal widths, which is how a setting is shown as a
-comparison - the same model at two values of it. The caption under each is translated; the file name
-is not.
-
-A file that is missing or will not decode is skipped, and a tooltip whose pictures are all missing is
-exactly the text tooltip it was before. So the art for a tooltip can land after the tooltip does, and
-a half-finished set never breaks the panel.
-
-## When a tooltip appears
-
-A tooltip waits for the pointer to rest on its control for 0.45 s. The panel is dense and the tooltip
-lands on the model beside it, so with no wait a sweep from the top of the panel down to Bake flashes a
-dozen large panels over the scene. Once one has just been up, the wait drops to 0.1 s for 0.7 s
-afterwards, so reading several settings in a row stays quick - but not to zero, or that same sweep
-would flash again the moment one tooltip had been seen.
-
-No tooltip appears at all while a control is being used - a slider dragged, a value typed into one, a
-combo open, a layer card being dragged. The pointer sits on the very thing being edited, so a tooltip
-there covers the model exactly while the user is watching it change. The full wait comes back
-afterwards rather than the short one: having just let go of a slider is not a reason to be shown a
-picture of it.
-
-A pointer resting on a control produces no events, and the canvas only renders when something asks it
-to, so the wait has to ask for its own frames, and so does an animation once one is on screen. So does
-a tooltip that has just appeared, animated or not: ImGui hides a window on the first frame it is
-submitted while it measures it, and does so every time a tooltip reappears because those windows are
-recycled, so the frame a tooltip is decided on is never the frame it is seen on. Both use
-`GLCanvas3D::request_extra_frame()`, which ends `on_idle()` with `evt.RequestMore()` and so obliges wx
-to deliver the next idle. `schedule_extra_frame()` is not enough on its own: it only arranges a timer
-whose event an idle event is assumed to follow, and on_idle renders nothing unless the canvas was
-already dirty when it ran. Asking for frames as fast as they come is safe here because which frame is
-drawn comes from the clock, not from the frame count, so a redraw that arrives early simply draws the
-same frame again.
-
-## Decoding and playback
-
-`slic3r/GUI/AnimatedTexture.hpp` decodes a file once and uploads one GL texture per frame. Stills go
-through `wxImage`; GIFs go through `wxGIFDecoder`, whose raw palette indices are composited here frame
-by frame, replaying the disposal method each frame asks for. That replay is what makes an animation
-look continuous: a GIF frame is a sub-rectangle drawn over what came before it, so an animation that
-only re-sends the pixels that changed draws as a flicker of disconnected patches without it.
-
-A frame delay of 0 or 1 hundredths of a second is read as 100 ms, the convention browsers settle on,
-so an animation authored against that plays at the speed it was authored at.
-
-The animation restarts when its tooltip opens, rather than running off a free-running clock: these are
-short loops of one setting going from one value to another, and joining one halfway through shows the
-end of a change the user never saw the start of.
-
-Which frame is drawn is measured on a real clock, not `ImGui::GetTime()`. Nothing in OrcaSlicer ever sets
-`io.DeltaTime`, so it keeps imgui's default of 1/60 per frame and imgui's clock counts frames rather
-than seconds. On a canvas that renders only when asked, that is not a clock at all: an animation driven
-by it crawls while the canvas is idle and races while a moving mouse is rendering it flat out.
-
-## Making one
-
-`scripts/gen_texture_displacement_tips.py` draws the lot, in four languages, picked by what the
-setting actually is:
-
- **A shaded relief**, for the settings that are about a pattern: Depth, Tile, Tile size, Rotation,
-  Repeat/Mirror, Smoothing, Edge fade, Invert, Blend and the Normal, Fast, Checker and Distortion
-  views. One motif - a ring inside a square frame - runs through all of them, because using one shape
-  everywhere is what lets two pictures be compared: whatever differs between them is the setting,
-  since nothing else is.
- **A flat mesh of triangles**, for the settings that are about the mesh or about a tool: the paint
-  tools, brush size, the connected-area fill, subdivision, feature-adaptive refinement, remeshing,
-  hard edges, slivers and the wireframe view. These carry the one accent colour in the set, meaning
-  "painted", because that is the only thing in such a picture that is not geometry.
- **A section**, for Midlevel and for smoothing the geometry. The reason generalises: shading reads
-  slopes, so a height field moved up or down as a whole shades identically to where it started, and
-  any setting whose meaning is *where the surface sits relative to where it was* is invisible from
-  above and has to be drawn from the side.
- **A flat ramp of greys**, for Mix filaments, Mixed colors and Denoise. Those are about which
-  filament a spot ends up as; lighting one would only add a second thing changing between two
-  pictures meant to differ in one.
-
-The five Mapping pictures are one ball with a checker laid on it five ways, which is the whole of what
-choosing a projection does - except Unwrap, which is not a projection onto the model at all and so is
-drawn as the flat layout it produces.
-
-Captures of the real tool are still the first choice for anything involving a real model or real
-filament colour: Bake, the mixed-colour count on a photograph, Adjust placement, the frame window and
-the UV editor's seam tool have no picture yet for that reason.
-
-Either way:
-
- Square, around 256 px (192 for an animation, where every frame ships). The tooltip is about 20 em
-  wide, so that is roughly native size on a 100% display and downscales cleanly above it. A single
-  picture is capped at 10 em tall and centred, two side by side take half the width each.
- Neutral grey. These say what a shape does; colour in one reads as a third thing the setting does,
-  and has to work against both themes.
- Animations loop seamlessly and stay short - 16 frames at 100 ms, under about 150 KB. They sit in
-  `resources/`, which ships with every copy of the application. A sweep driven by a cosine over the
-  frame count loops with no step, since it starts and ends at the same value and the same rate.
- No text in the picture. Captions are translated; pixels are not.
@@ -7478,7 +7478,7 @@ msgid "Update"
 msgstr "更新"

 msgid "Assistant(HMS)"
-msgstr "助手(HMS)"
+msgstr "助理（HMS）"

 #, c-format, boost-format
 msgid "Network plug-in v%s"
@@ -1,3 +0,0 @@
-<svg width="28" height="27" viewBox="0 0 28 27" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path transform="matrix(0.9 0 0 0.9 1.4 1.35)" d="M11.9888 2.01601C12.8984 0.494662 15.1024 0.494662 16.012 2.01601L18.8677 6.79237C19.1958 7.34113 19.7339 7.73201 20.3572 7.87447L25.7821 9.11446C27.5101 9.50943 28.1913 11.6056 27.0254 12.9408L23.3652 17.1327C22.9449 17.6143 22.7394 18.2469 22.7964 18.8836L23.2936 24.4263C23.4519 26.1918 21.6687 27.4873 20.0386 26.7911L14.9209 24.6056C14.3329 24.3545 13.6679 24.3545 13.0799 24.6056L7.96209 26.7911C6.33196 27.4873 4.54887 26.1918 4.70722 24.4263L5.20434 18.8836C5.26145 18.2469 5.05595 17.6143 4.63544 17.1327L0.97533 12.9408C-0.19048 11.6056 0.490599 9.50943 2.21859 9.11446L7.64364 7.87447C8.2669 7.73201 8.80494 7.34113 9.13302 6.79237L11.9888 2.01601Z" stroke="#949494" stroke-width="2.4" stroke-linejoin="round"/>
-</svg>
@@ -1,790 +0,0 @@
-{
-	"name": "FELIX Printers",
-	"version": "1.0.0",
-	"force_update": "0",
-	"description": "Configuration file for printers by FELIX Printers",
-	"machine_model_list": [
-		{
-			"name": "FELIX Food Double",
-			"sub_path": "machine/FELIX Food Double.json"
-		},
-		{
-			"name": "FELIX Food Single",
-			"sub_path": "machine/FELIX Food Single.json"
-		},
-		{
-			"name": "FELIX Food Switch",
-			"sub_path": "machine/FELIX Food Switch.json"
-		},
-		{
-			"name": "FELIX Pro 3",
-			"sub_path": "machine/FELIX Pro 3.json"
-		},
-		{
-			"name": "FELIX Pro L 3.0",
-			"sub_path": "machine/FELIX Pro L 3.0.json"
-		},
-		{
-			"name": "FELIX Pro XL 3.0",
-			"sub_path": "machine/FELIX Pro XL 3.0.json"
-		},
-		{
-			"name": "FELIX Tec 4",
-			"sub_path": "machine/FELIX Tec 4.json"
-		}
-	],
-	"machine_list": [
-		{
-			"name": "fdm_all_machines_common",
-			"sub_path": "machine/fdm_all_machines_common.json"
-		},
-		{
-			"name": "fdm_felix_food_common",
-			"sub_path": "machine/fdm_felix_food_common.json"
-		},
-		{
-			"name": "fdm_felix_food_double_common",
-			"sub_path": "machine/fdm_felix_food_double_common.json"
-		},
-		{
-			"name": "fdm_felix_food_switch_common",
-			"sub_path": "machine/fdm_felix_food_switch_common.json"
-		},
-		{
-			"name": "fdm_felix_plastic_common",
-			"sub_path": "machine/fdm_felix_plastic_common.json"
-		},
-		{
-			"name": "fdm_felix_pro_3_common",
-			"sub_path": "machine/fdm_felix_pro_3_common.json"
-		},
-		{
-			"name": "fdm_felix_pro_l_3_common",
-			"sub_path": "machine/fdm_felix_pro_l_3.json"
-		},
-		{
-			"name": "fdm_felix_pro_xl_3_common",
-			"sub_path": "machine/fdm_felix_pro_xl_3_common.json"
-		},
-		{
-			"name": "fdm_felix_tec_common",
-			"sub_path": "machine/fdm_felix_tec_common.json"
-		},
-		{
-			"name": "FELIX Food Single 0.50mm nozzle",
-			"sub_path": "machine/FELIX Food Single 0.50mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Single 1.00mm nozzle",
-			"sub_path": "machine/FELIX Food Single 1.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Single 2.00mm nozzle",
-			"sub_path": "machine/FELIX Food Single 2.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Single 3.00mm nozzle",
-			"sub_path": "machine/FELIX Food Single 3.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Single 4.00mm nozzle",
-			"sub_path": "machine/FELIX Food Single 4.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Double 0.50mm nozzle",
-			"sub_path": "machine/FELIX Food Double 0.50mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Double 1.00mm nozzle",
-			"sub_path": "machine/FELIX Food Double 1.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Double 2.00mm nozzle",
-			"sub_path": "machine/FELIX Food Double 2.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Double 3.00mm nozzle",
-			"sub_path": "machine/FELIX Food Double 3.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Double 4.00mm nozzle",
-			"sub_path": "machine/FELIX Food Double 4.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Switch 0.50mm nozzle",
-			"sub_path": "machine/FELIX Food Switch 0.50mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Switch 1.00mm nozzle",
-			"sub_path": "machine/FELIX Food Switch 1.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Switch 2.00mm nozzle",
-			"sub_path": "machine/FELIX Food Switch 2.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Switch 3.00mm nozzle",
-			"sub_path": "machine/FELIX Food Switch 3.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Food Switch 4.00mm nozzle",
-			"sub_path": "machine/FELIX Food Switch 4.00mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro 3 0.25mm nozzle",
-			"sub_path": "machine/FELIX Pro 3 0.25mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro 3 0.35mm nozzle",
-			"sub_path": "machine/FELIX Pro 3 0.35mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro 3 0.50mm nozzle",
-			"sub_path": "machine/FELIX Pro 3 0.50mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro 3 0.70mm nozzle",
-			"sub_path": "machine/FELIX Pro 3 0.70mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro L 3.0 0.25mm nozzle",
-			"sub_path": "machine/FELIX Pro L 3.0 0.25mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro L 3.0 0.35mm nozzle",
-			"sub_path": "machine/FELIX Pro L 3.0 0.35mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro L 3.0 0.50mm nozzle",
-			"sub_path": "machine/FELIX Pro L 3.0 0.50mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro L 3.0 0.70mm nozzle",
-			"sub_path": "machine/FELIX Pro L 3.0 0.70mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro XL 3.0 0.25mm nozzle",
-			"sub_path": "machine/FELIX Pro XL 3.0 0.25mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro XL 3.0 0.35mm nozzle",
-			"sub_path": "machine/FELIX Pro XL 3.0 0.35mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro XL 3.0 0.50mm nozzle",
-			"sub_path": "machine/FELIX Pro XL 3.0 0.50mm nozzle.json"
-		},
-		{
-			"name": "FELIX Pro XL 3.0 0.70mm nozzle",
-			"sub_path": "machine/FELIX Pro XL 3.0 0.70mm nozzle.json"
-		},
-		{
-			"name": "FELIX Tec 4 0.25mm nozzle",
-			"sub_path": "machine/FELIX Tec 4 0.25mm nozzle.json"
-		},
-		{
-			"name": "FELIX Tec 4 0.35mm nozzle",
-			"sub_path": "machine/FELIX Tec 4 0.35mm nozzle.json"
-		},
-		{
-			"name": "FELIX Tec 4 0.50mm nozzle",
-			"sub_path": "machine/FELIX Tec 4 0.50mm nozzle.json"
-		},
-		{
-			"name": "FELIX Tec 4 0.70mm nozzle",
-			"sub_path": "machine/FELIX Tec 4 0.70mm nozzle.json"
-		}
-	],
-	"process_list": [
-		{
-			"name": "fdm_process_common",
-			"sub_path": "process/fdm_process_common.json"
-		},
-		{
-			"name": "fdm_process_felix_food_common",
-			"sub_path": "process/fdm_process_felix_food_common.json"
-		},
-		{
-			"name": "fdm_process_felix_plastic_common",
-			"sub_path": "process/fdm_process_felix_plastic_common.json"
-		},
-		{
-			"name": "FELIX Food Coarse @ 0.50mm",
-			"sub_path": "process/FELIX Food Coarse @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Food Coarse @ 1.00mm",
-			"sub_path": "process/FELIX Food Coarse @ 1.00mm.json"
-		},
-		{
-			"name": "FELIX Food Coarse @ 2.00mm",
-			"sub_path": "process/FELIX Food Coarse @ 2.00mm.json"
-		},
-		{
-			"name": "FELIX Food Coarse @ 3.00mm",
-			"sub_path": "process/FELIX Food Coarse @ 3.00mm.json"
-		},
-		{
-			"name": "FELIX Food Coarse @ 4.00mm",
-			"sub_path": "process/FELIX Food Coarse @ 4.00mm.json"
-		},
-		{
-			"name": "FELIX Food Fine @ 0.50mm",
-			"sub_path": "process/FELIX Food Fine @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Food Fine @ 1.00mm",
-			"sub_path": "process/FELIX Food Fine @ 1.00mm.json"
-		},
-		{
-			"name": "FELIX Food Fine @ 2.00mm",
-			"sub_path": "process/FELIX Food Fine @ 2.00mm.json"
-		},
-		{
-			"name": "FELIX Food Fine @ 3.00mm",
-			"sub_path": "process/FELIX Food Fine @ 3.00mm.json"
-		},
-		{
-			"name": "FELIX Food Fine @ 4.00mm",
-			"sub_path": "process/FELIX Food Fine @ 4.00mm.json"
-		},
-		{
-			"name": "FELIX Food Normal @ 0.50mm",
-			"sub_path": "process/FELIX Food Normal @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Food Normal @ 1.00mm",
-			"sub_path": "process/FELIX Food Normal @ 1.00mm.json"
-		},
-		{
-			"name": "FELIX Food Normal @ 2.00mm",
-			"sub_path": "process/FELIX Food Normal @ 2.00mm.json"
-		},
-		{
-			"name": "FELIX Food Normal @ 3.00mm",
-			"sub_path": "process/FELIX Food Normal @ 3.00mm.json"
-		},
-		{
-			"name": "FELIX Food Normal @ 4.00mm",
-			"sub_path": "process/FELIX Food Normal @ 4.00mm.json"
-		},
-		{
-			"name": "FELIX Plastic Coarse @ 0.35mm",
-			"sub_path": "process/FELIX Plastic Coarse @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Plastic Coarse @ 0.50mm",
-			"sub_path": "process/FELIX Plastic Coarse @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Plastic Coarse @ 0.70mm",
-			"sub_path": "process/FELIX Plastic Coarse @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Plastic Fine @ 0.25mm",
-			"sub_path": "process/FELIX Plastic Fine @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX Plastic Fine @ 0.35mm",
-			"sub_path": "process/FELIX Plastic Fine @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Plastic Fine @ 0.50mm",
-			"sub_path": "process/FELIX Plastic Fine @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Plastic Fine @ 0.70mm",
-			"sub_path": "process/FELIX Plastic Fine @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Plastic Normal @ 0.25mm",
-			"sub_path": "process/FELIX Plastic Normal @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX Plastic Normal @ 0.35mm",
-			"sub_path": "process/FELIX Plastic Normal @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Plastic Normal @ 0.50mm",
-			"sub_path": "process/FELIX Plastic Normal @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Plastic Normal @ 0.70mm",
-			"sub_path": "process/FELIX Plastic Normal @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Plastic Slightly Coarse @ 0.35mm",
-			"sub_path": "process/FELIX Plastic Slightly Coarse @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Plastic Slightly Coarse @ 0.50mm",
-			"sub_path": "process/FELIX Plastic Slightly Coarse @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Plastic Slightly Coarse @ 0.70mm",
-			"sub_path": "process/FELIX Plastic Slightly Coarse @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Plastic Super Coarse @ 0.70mm",
-			"sub_path": "process/FELIX Plastic Super Coarse @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Plastic Super Fine @ 0.25mm",
-			"sub_path": "process/FELIX Plastic Super Fine @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX Plastic Super Fine @ 0.35mm",
-			"sub_path": "process/FELIX Plastic Super Fine @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Plastic Very Coarse @ 0.50mm",
-			"sub_path": "process/FELIX Plastic Very Coarse @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Plastic Very Coarse @ 0.70mm",
-			"sub_path": "process/FELIX Plastic Very Coarse @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Plastic Very Fine @ 0.25mm",
-			"sub_path": "process/FELIX Plastic Very Fine @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX Plastic Very Fine @ 0.35mm",
-			"sub_path": "process/FELIX Plastic Very Fine @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Plastic Very Fine @ 0.50mm",
-			"sub_path": "process/FELIX Plastic Very Fine @ 0.50mm.json"
-		}
-	],
-	"filament_list": [
-		{
-			"name": "fdm_filament_common",
-			"sub_path": "filament/fdm_filament_common.json"
-		},
-		{
-			"name": "fdm_filament_food",
-			"sub_path": "filament/fdm_filament_food.json"
-		},
-		{
-			"name": "fdm_filament_abs",
-			"sub_path": "filament/fdm_filament_abs.json"
-		},
-		{
-			"name": "fdm_filament_asa",
-			"sub_path": "filament/fdm_filament_asa.json"
-		},
-		{
-			"name": "fdm_filament_flex",
-			"sub_path": "filament/fdm_filament_flex.json"
-		},
-		{
-			"name": "fdm_filament_pa",
-			"sub_path": "filament/fdm_filament_pa.json"
-		},
-		{
-			"name": "fdm_filament_pa11cf",
-			"sub_path": "filament/fdm_filament_pa11cf.json"
-		},
-		{
-			"name": "fdm_filament_pc",
-			"sub_path": "filament/fdm_filament_pc.json"
-		},
-		{
-			"name": "fdm_filament_pccf",
-			"sub_path": "filament/fdm_filament_pccf.json"
-		},
-		{
-			"name": "fdm_filament_pet",
-			"sub_path": "filament/fdm_filament_pet.json"
-		},
-		{
-			"name": "fdm_filament_pla",
-			"sub_path": "filament/fdm_filament_pla.json"
-		},
-		{
-			"name": "fdm_filament_pva",
-			"sub_path": "filament/fdm_filament_pva.json"
-		},
-		{
-			"name": "fdm_filament_pvb",
-			"sub_path": "filament/fdm_filament_pvb.json"
-		},
-		{
-			"name": "fdm_filament_tpu",
-			"sub_path": "filament/fdm_filament_tpu.json"
-		},
-		{
-			"name": "Food Medium Plastic Syringe @0.50mm",
-			"sub_path": "filament/FELIXFood/Food Medium Plastic Syringe @0.50mm.json"
-		},
-		{
-			"name": "Food Medium Plastic Syringe @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Plastic Syringe @1.00mm.json"
-		},
-		{
-			"name": "Food Medium Plastic Syringe @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Plastic Syringe @2.00mm.json"
-		},
-		{
-			"name": "Food Medium Plastic Syringe @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Plastic Syringe @3.00mm.json"
-		},
-		{
-			"name": "Food Medium Plastic Syringe @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Plastic Syringe @4.00mm.json"
-		},
-		{
-			"name": "Food Medium Stainless Steel Syringe @0.50mm",
-			"sub_path": "filament/FELIXFood/Food Medium Stainless Steel Syringe @0.50mm.json"
-		},
-		{
-			"name": "Food Medium Stainless Steel Syringe @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Stainless Steel Syringe @1.00mm.json"
-		},
-		{
-			"name": "Food Medium Stainless Steel Syringe @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Stainless Steel Syringe @2.00mm.json"
-		},
-		{
-			"name": "Food Medium Stainless Steel Syringe @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Stainless Steel Syringe @3.00mm.json"
-		},
-		{
-			"name": "Food Medium Stainless Steel Syringe @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Medium Stainless Steel Syringe @4.00mm.json"
-		},
-		{
-			"name": "Food Thick Stainless Steel Syringe @0.50mm",
-			"sub_path": "filament/FELIXFood/Food Thick Stainless Steel Syringe @0.50mm.json"
-		},
-		{
-			"name": "Food Thick Stainless Steel Syringe @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Thick Stainless Steel Syringe @1.00mm.json"
-		},
-		{
-			"name": "Food Thick Stainless Steel Syringe @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Thick Stainless Steel Syringe @2.00mm.json"
-		},
-		{
-			"name": "Food Thick Stainless Steel Syringe @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Thick Stainless Steel Syringe @3.00mm.json"
-		},
-		{
-			"name": "Food Thick Stainless Steel Syringe @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Thick Stainless Steel Syringe @4.00mm.json"
-		},
-		{
-			"name": "Food Thin Plastic Syringe @0.50mm",
-			"sub_path": "filament/FELIXFood/Food Thin Plastic Syringe @0.50mm.json"
-		},
-		{
-			"name": "Food Thin Plastic Syringe @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Plastic Syringe @1.00mm.json"
-		},
-		{
-			"name": "Food Thin Plastic Syringe @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Plastic Syringe @2.00mm.json"
-		},
-		{
-			"name": "Food Thin Plastic Syringe @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Plastic Syringe @3.00mm.json"
-		},
-		{
-			"name": "Food Thin Plastic Syringe @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Plastic Syringe @4.00mm.json"
-		},
-		{
-			"name": "Food Thin Stainless Steel Syringe @0.50mm",
-			"sub_path": "filament/FELIXFood/Food Thin Stainless Steel Syringe @0.50mm.json"
-		},
-		{
-			"name": "Food Thin Stainless Steel Syringe @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Stainless Steel Syringe @1.00mm.json"
-		},
-		{
-			"name": "Food Thin Stainless Steel Syringe @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Stainless Steel Syringe @2.00mm.json"
-		},
-		{
-			"name": "Food Thin Stainless Steel Syringe @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Stainless Steel Syringe @3.00mm.json"
-		},
-		{
-			"name": "Food Thin Stainless Steel Syringe @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Thin Stainless Steel Syringe @4.00mm.json"
-		},
-		{
-			"name": "Food Very Thick Stainless Steel Syringe @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thick Stainless Steel Syringe @1.00mm.json"
-		},
-		{
-			"name": "Food Very Thick Stainless Steel Syringe @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thick Stainless Steel Syringe @2.00mm.json"
-		},
-		{
-			"name": "Food Very Thick Stainless Steel Syringe @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thick Stainless Steel Syringe @3.00mm.json"
-		},
-		{
-			"name": "Food Very Thick Stainless Steel Syringe @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thick Stainless Steel Syringe @4.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Plastic Syringe @0.50mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Plastic Syringe @0.50mm.json"
-		},
-		{
-			"name": "Food Very Thin Plastic Syringe @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Plastic Syringe @1.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Plastic Syringe @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Plastic Syringe @2.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Plastic Syringe @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Plastic Syringe @3.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Plastic Syringe @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Plastic Syringe @4.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Stainless Steel  Syringe  @1.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Stainless Steel  Syringe  @1.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Stainless Steel  Syringe  @2.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Stainless Steel  Syringe  @2.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Stainless Steel  Syringe  @3.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Stainless Steel  Syringe  @3.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Stainless Steel  Syringe  @4.00mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Stainless Steel  Syringe  @4.00mm.json"
-		},
-		{
-			"name": "Food Very Thin Stainless Steel Syringe @0.50mm",
-			"sub_path": "filament/FELIXFood/Food Very Thin Stainless Steel Syringe @0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA TitanX ABS Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA TitanX ABS Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA TitanX ABS Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA TitanX ABS Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA TitanX ABS Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA TitanX ABS Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FORMFUTURA TitanX ABS Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA TitanX ABS Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA TitanX ABS Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA TitanX ABS Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA TitanX ABS Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA TitanX ABS Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "Ultrafuse ABS Fusion+ Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/Ultrafuse ABS Fusion+ Brass @ 0.35mm.json"
-		},
-		{
-			"name": "Ultrafuse ABS Fusion+ Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/Ultrafuse ABS Fusion+ Brass @ 0.50mm.json"
-		},
-		{
-			"name": "Ultrafuse ABS Fusion+ Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/Ultrafuse ABS Fusion+ Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "Ultrafuse ABS Fusion+ Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/Ultrafuse ABS Fusion+ Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "Ultrafuse ABS Fusion+ Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/Ultrafuse ABS Fusion+ Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "Ultrafuse ABS Fusion+ Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/Ultrafuse ABS Fusion+ Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "FORMFUTURA AppoloX ASA Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA AppoloX ASA Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA AppoloX ASA Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA AppoloX ASA Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA AppoloX ASA Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA AppoloX ASA Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FORMFUTURA AppoloX ASA Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA AppoloX ASA Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA AppoloX ASA Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA AppoloX ASA Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA AppoloX ASA Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA AppoloX ASA Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX FLEX  Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX FLEX  Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX FLEX  Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX FLEX  Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX FLEX Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FELIX FLEX Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX FLEX Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX FLEX Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX FLEX Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX FLEX Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX FLEX Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FELIX FLEX Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX PETG Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX PETG Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX PETG Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX PETG Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX PETG Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FELIX PETG Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX PETG Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX PETG Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX PETG Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX PETG Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX PETG Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FELIX PETG Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Premium PLA Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Premium PLA Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Premium PLA Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Premium PLA Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Premium PLA Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Premium PLA Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX Premium PLA Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Premium PLA Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Premium PLA Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Premium PLA Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Premium PLA Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Premium PLA Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "FELIX Wood  Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Wood  Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Wood Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Wood Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Wood Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Wood Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FELIX Wood Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Wood Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FELIX Wood Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Wood Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FELIX Wood Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FELIX Wood Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "FORMFUTURA ePLA Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA ePLA Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA ePLA Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA ePLA Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA ePLA Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA ePLA Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FORMFUTURA ePLA Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA ePLA Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA ePLA Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA ePLA Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA ePLA Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA ePLA Hardened Steel @ 0.70mm.json"
-		},
-		{
-			"name": "FORMFUTURA Aquasolve PVA Brass @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA Aquasolve PVA Brass @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA Aquasolve PVA Brass @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA Aquasolve PVA Brass @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA Aquasolve PVA Hardened Steel @ 0.25mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA Aquasolve PVA Hardened Steel @ 0.25mm.json"
-		},
-		{
-			"name": "FORMFUTURA Aquasolve PVA Hardened Steel @ 0.35mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA Aquasolve PVA Hardened Steel @ 0.35mm.json"
-		},
-		{
-			"name": "FORMFUTURA Aquasolve PVA Hardened Steel @ 0.50mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA Aquasolve PVA Hardened Steel @ 0.50mm.json"
-		},
-		{
-			"name": "FORMFUTURA Aquasolve PVA Hardened Steel @ 0.70mm",
-			"sub_path": "filament/FELIXPlastic/FORMFUTURA Aquasolve PVA Hardened Steel @ 0.70mm.json"
-		}
-	]
-}
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="180.62mm" height="180.62mm" viewBox="0 0 512 512" xmlns:c2pa="http://c2pa.org/manifest">
-  <rect x="0" y="0" width="512" height="512" fill="none"/>
-  <g fill="#ffffff" transform="translate(5,460) scale(0.2)">
-    <g>
-      <path d="M139.4.8l-.2,62c-34.3,0-63.4,21.8-73.2,51.9C26.4,141,.2,187.8.2,241.3H0l.2-101.3C.2,63.1,62.4.8,139.4.8Z"/>
-      <path d="M139.1,92.5l-.8,62.5c-42.6,0-77.1,38.6-77.1,86.3l1-103.9c0-7.9,1.3-15.5,3.6-22.7,21.2-14.1,46.3-22.3,73.2-22.3Z"/>
-      <path d="M65.9,114.7c-2.3,7.2-3.6,14.8-3.6,22.7l-1,103.9H.2c0-53.5,26.3-100.3,65.7-126.6Z"/>
-    </g>
-    <polygon points="202.8 .4 202.8 92.9 226.2 92.9 226.2 56 259.8 56 259.8 36.1 226.2 36.1 226.2 19.4 265.7 19.4 265.7 0 202.8 .4"/>
-    <polygon points="282.3 -.3 282.3 93 346.1 93 346.1 72.4 306.8 72.4 306.8 55.6 341.7 55.6 341.7 36.4 306.5 36.4 306.5 19.6 346.2 19.6 346.2 -.3 282.3 -.3"/>
-    <polygon points="365.9 92.8 429.5 92.8 429.5 70.9 389.6 70.9 389.6 .2 365 .2 365.9 92.8"/>
-    <polygon points="448 0 471.9 0 471.9 92.5 447.5 92.5 448 0"/>
-    <path d="M485.1,92.5s34.7-44.3,33.4-46.5S485.7,0,485.7,0h29l18.4,24.8L550.1,0h26.6l-29.9,45.4,33.1,46.8h-28.8l-19.3-27.4-18.9,28.1-27.9-.4Z"/>
-    <g>
-      <path d="M210.9,154.1c-1.9,0-3.7-.2-5.3-.7-1.6-.4-3-1-4.2-1.6v-3.9c1.1.6,2.4,1.1,3.9,1.6,1.5.5,3.2.7,5.1.7,3.1,0,5.5-.6,7.2-1.7,1.7-1.2,2.5-2.8,2.5-5s-.8-3.9-2.5-5c-1.7-1.2-4.2-1.7-7.4-1.7h-3.9v-3.7h4c2.6,0,4.5-.5,5.9-1.5,1.4-1,2-2.4,2-4.2s-.3-2.3-1-3.1c-.6-.8-1.6-1.5-2.8-1.9-1.3-.4-2.8-.7-4.6-.7s-3,.2-4.3.6c-1.3.4-2.4.8-3.3,1.3v-3.9c1.1-.5,2.3-.9,3.6-1.3,1.3-.4,2.8-.5,4.5-.5s4,.3,5.5.8c1.5.5,2.7,1.3,3.6,2.2.9.9,1.6,1.9,2,3.1.4,1.1.6,2.3.6,3.4s-.2,2.4-.7,3.3c-.5.9-1,1.7-1.6,2.2-.6.6-1.4,1.1-2.3,1.6,1.3.7,2.3,1.4,3.2,2.1s1.6,1.7,2.2,2.8c.6,1.1,1,2.5,1,4.2s-.2,2.5-.7,3.8c-.5,1.2-1.2,2.4-2.2,3.4s-2.4,1.8-4,2.4c-1.7.6-3.7.9-6.1.9Z"/>
-      <path d="M232.1,153.7v-35.4h11.1c5.5,0,9.7,1.5,12.4,4.4,2.8,3,4.2,7.4,4.2,13.2s-1.4,10.3-4.2,13.2c-2.8,3-6.9,4.5-12.4,4.5h-11.1ZM235.9,150h7c4.5,0,7.8-1.1,9.9-3.4,2-2.3,3.1-5.8,3.1-10.7s-1-8.4-3.1-10.7c-2-2.3-5.3-3.4-9.9-3.4h-7v28.2Z"/>
-      <path d="M291.9,154.4c-.8,0-1.7-.1-2.6-.3-1-.2-1.9-.5-2.8-.8-.9-.3-1.7-.7-2.4-1l1.3-1.3v14.2h-3.8v-33.2c0-1.1.3-2,1-2.7.7-.7,1.6-1.2,2.7-1.6,1.1-.4,2.3-.6,3.5-.8,1.2-.2,2.4-.2,3.5-.2,2.1,0,4.1.4,6,1.3,1.9.9,3.4,2.4,4.6,4.5s1.7,5,1.7,8.6-.5,5.1-1.5,7.1c-1,2-2.4,3.5-4.3,4.6-1.9,1.1-4.2,1.6-6.9,1.6ZM291.9,150.9c1.9,0,3.5-.4,4.8-1.2,1.3-.8,2.2-2,2.8-3.5.6-1.5,1-3.2,1-5.1s-.2-3.7-.6-5.4c-.4-1.7-1.2-3-2.4-4-1.2-1-3-1.5-5.2-1.5s-3.4.2-4.8.6c-1.4.4-2,1-2,1.8v16.4c1.1.6,2.2,1.1,3.3,1.4s2.2.5,3.3.5Z"/>
-      <path d="M311.1,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1c-.8,0-1.6.2-2.4.3-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M330.5,122.5v-4.2h4.2v4.2h-4.2ZM330.8,153.7v-26.4h3.8v26.4h-3.8Z"/>
-      <path d="M342.7,129.3c.8-.4,1.7-.8,2.6-1.1.9-.3,1.8-.6,2.8-.8.9-.2,1.9-.4,2.9-.5,1-.1,2-.2,2.9-.2,2.6,0,4.6.4,6.1,1.1,1.5.8,2.6,1.9,3.3,3.3.7,1.4,1,3.2,1,5.2v17.2h-3.8v-17.2c0-.6,0-1.3-.2-2-.2-.7-.5-1.4-.9-2-.5-.7-1.2-1.2-2.1-1.6s-2.2-.6-3.8-.6-2.2,0-3.4.3-2.4.4-3.6.8v22.4h-3.8v-24.3Z"/>
-      <path d="M380.7,154.1c-1.9,0-3.4-.6-4.7-1.7-1.3-1.1-1.9-2.9-1.9-5.1v-16.5h-4.6v-3.5h4.6v-7.5h3.8v7.5h6.8v3.5h-6.8v15.3c0,1.5.2,2.6.7,3.3s1.4,1.1,2.8,1.1,1.3,0,1.9-.2,1.1-.3,1.5-.5v3.6c-.5.2-1.1.3-1.9.5s-1.5.2-2.1.2Z"/>
-      <path d="M402,154.4c-2.5,0-4.7-.5-6.5-1.6-1.8-1-3.3-2.6-4.2-4.7-1-2.1-1.5-4.7-1.5-7.8,0-4.6,1-8,3.1-10.3,2.1-2.3,4.9-3.4,8.5-3.4s5.1.6,6.8,1.9c1.7,1.3,2.9,3,3.7,5.1.7,2.2,1.1,4.6,1.1,7.3h-21.3l.3-3.5h18.5l-1.5.5c-.1-2.6-.8-4.6-2-5.9-1.2-1.3-3.1-2-5.6-2s-3.2.3-4.3,1c-1.1.6-2,1.7-2.6,3.3s-.8,3.8-.8,6.6.8,5.7,2.3,7.3c1.5,1.7,3.6,2.5,6.3,2.5s2.5,0,3.6-.3,2.1-.5,3-.8c.9-.4,1.7-.7,2.4-1.2v3.9c-1.3.6-2.7,1.1-4.2,1.4-1.5.3-3.2.5-5.1.5Z"/>
-      <path d="M419.5,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1-1.6.2-2.4.3c-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M446.4,154.4c-1.9,0-3.5-.2-4.8-.6s-2.6-.9-4-1.6v-4c1.1.6,2.1,1.1,2.9,1.5s1.7.7,2.6.9c.9.2,1.9.3,3,.3,1.8,0,3.2-.4,4.3-1.2,1.1-.8,1.7-1.8,1.7-3s-.3-1.7-.8-2.3-1.2-1-2.1-1.3c-.8-.4-1.7-.7-2.7-1.1-1-.3-2.1-.6-3.1-.9-1-.3-2-.8-2.9-1.3-.9-.5-1.6-1.3-2.1-2.1-.5-.9-.8-2-.8-3.4s.3-2.5.8-3.4c.5-1,1.3-1.7,2.1-2.4.9-.6,1.9-1.1,3-1.4,1.1-.3,2.2-.4,3.3-.4,1.6,0,2.9.2,4.1.6,1.1.4,2.3.9,3.5,1.4v3.8c-1.3-.7-2.5-1.3-3.6-1.7-1.1-.4-2.3-.7-3.8-.7s-2.7.3-3.9.9c-1.1.6-1.7,1.5-1.7,2.7s.3,1.8.9,2.4,1.4,1,2.3,1.4c1,.3,2,.7,3.1,1,.9.3,1.8.6,2.8.9,1,.3,1.8.8,2.7,1.3.8.5,1.5,1.3,2,2.1.5.9.8,2,.8,3.4s-.5,3.4-1.4,4.6-2.2,2.1-3.6,2.7c-1.5.6-3,.8-4.5.8Z"/>
-    </g>
-  </g>
-</svg>
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="180.62mm" height="180.62mm" viewBox="0 0 250 195" xmlns:c2pa="http://c2pa.org/manifest">
-  <rect x="0" y="0" width="250" height="195" fill="none"/>
-  <g fill="#ffffff" transform="translate(2,169) scale(0.1)">
-    <g>
-      <path d="M139.4.8l-.2,62c-34.3,0-63.4,21.8-73.2,51.9C26.4,141,.2,187.8.2,241.3H0l.2-101.3C.2,63.1,62.4.8,139.4.8Z"/>
-      <path d="M139.1,92.5l-.8,62.5c-42.6,0-77.1,38.6-77.1,86.3l1-103.9c0-7.9,1.3-15.5,3.6-22.7,21.2-14.1,46.3-22.3,73.2-22.3Z"/>
-      <path d="M65.9,114.7c-2.3,7.2-3.6,14.8-3.6,22.7l-1,103.9H.2c0-53.5,26.3-100.3,65.7-126.6Z"/>
-    </g>
-    <polygon points="202.8 .4 202.8 92.9 226.2 92.9 226.2 56 259.8 56 259.8 36.1 226.2 36.1 226.2 19.4 265.7 19.4 265.7 0 202.8 .4"/>
-    <polygon points="282.3 -.3 282.3 93 346.1 93 346.1 72.4 306.8 72.4 306.8 55.6 341.7 55.6 341.7 36.4 306.5 36.4 306.5 19.6 346.2 19.6 346.2 -.3 282.3 -.3"/>
-    <polygon points="365.9 92.8 429.5 92.8 429.5 70.9 389.6 70.9 389.6 .2 365 .2 365.9 92.8"/>
-    <polygon points="448 0 471.9 0 471.9 92.5 447.5 92.5 448 0"/>
-    <path d="M485.1,92.5s34.7-44.3,33.4-46.5S485.7,0,485.7,0h29l18.4,24.8L550.1,0h26.6l-29.9,45.4,33.1,46.8h-28.8l-19.3-27.4-18.9,28.1-27.9-.4Z"/>
-    <g>
-      <path d="M210.9,154.1c-1.9,0-3.7-.2-5.3-.7-1.6-.4-3-1-4.2-1.6v-3.9c1.1.6,2.4,1.1,3.9,1.6,1.5.5,3.2.7,5.1.7,3.1,0,5.5-.6,7.2-1.7,1.7-1.2,2.5-2.8,2.5-5s-.8-3.9-2.5-5c-1.7-1.2-4.2-1.7-7.4-1.7h-3.9v-3.7h4c2.6,0,4.5-.5,5.9-1.5,1.4-1,2-2.4,2-4.2s-.3-2.3-1-3.1c-.6-.8-1.6-1.5-2.8-1.9-1.3-.4-2.8-.7-4.6-.7s-3,.2-4.3.6c-1.3.4-2.4.8-3.3,1.3v-3.9c1.1-.5,2.3-.9,3.6-1.3,1.3-.4,2.8-.5,4.5-.5s4,.3,5.5.8c1.5.5,2.7,1.3,3.6,2.2.9.9,1.6,1.9,2,3.1.4,1.1.6,2.3.6,3.4s-.2,2.4-.7,3.3c-.5.9-1,1.7-1.6,2.2-.6.6-1.4,1.1-2.3,1.6,1.3.7,2.3,1.4,3.2,2.1s1.6,1.7,2.2,2.8c.6,1.1,1,2.5,1,4.2s-.2,2.5-.7,3.8c-.5,1.2-1.2,2.4-2.2,3.4s-2.4,1.8-4,2.4c-1.7.6-3.7.9-6.1.9Z"/>
-      <path d="M232.1,153.7v-35.4h11.1c5.5,0,9.7,1.5,12.4,4.4,2.8,3,4.2,7.4,4.2,13.2s-1.4,10.3-4.2,13.2c-2.8,3-6.9,4.5-12.4,4.5h-11.1ZM235.9,150h7c4.5,0,7.8-1.1,9.9-3.4,2-2.3,3.1-5.8,3.1-10.7s-1-8.4-3.1-10.7c-2-2.3-5.3-3.4-9.9-3.4h-7v28.2Z"/>
-      <path d="M291.9,154.4c-.8,0-1.7-.1-2.6-.3-1-.2-1.9-.5-2.8-.8-.9-.3-1.7-.7-2.4-1l1.3-1.3v14.2h-3.8v-33.2c0-1.1.3-2,1-2.7.7-.7,1.6-1.2,2.7-1.6,1.1-.4,2.3-.6,3.5-.8,1.2-.2,2.4-.2,3.5-.2,2.1,0,4.1.4,6,1.3,1.9.9,3.4,2.4,4.6,4.5s1.7,5,1.7,8.6-.5,5.1-1.5,7.1c-1,2-2.4,3.5-4.3,4.6-1.9,1.1-4.2,1.6-6.9,1.6ZM291.9,150.9c1.9,0,3.5-.4,4.8-1.2,1.3-.8,2.2-2,2.8-3.5.6-1.5,1-3.2,1-5.1s-.2-3.7-.6-5.4c-.4-1.7-1.2-3-2.4-4-1.2-1-3-1.5-5.2-1.5s-3.4.2-4.8.6c-1.4.4-2,1-2,1.8v16.4c1.1.6,2.2,1.1,3.3,1.4s2.2.5,3.3.5Z"/>
-      <path d="M311.1,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1c-.8,0-1.6.2-2.4.3-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M330.5,122.5v-4.2h4.2v4.2h-4.2ZM330.8,153.7v-26.4h3.8v26.4h-3.8Z"/>
-      <path d="M342.7,129.3c.8-.4,1.7-.8,2.6-1.1.9-.3,1.8-.6,2.8-.8.9-.2,1.9-.4,2.9-.5,1-.1,2-.2,2.9-.2,2.6,0,4.6.4,6.1,1.1,1.5.8,2.6,1.9,3.3,3.3.7,1.4,1,3.2,1,5.2v17.2h-3.8v-17.2c0-.6,0-1.3-.2-2-.2-.7-.5-1.4-.9-2-.5-.7-1.2-1.2-2.1-1.6s-2.2-.6-3.8-.6-2.2,0-3.4.3-2.4.4-3.6.8v22.4h-3.8v-24.3Z"/>
-      <path d="M380.7,154.1c-1.9,0-3.4-.6-4.7-1.7-1.3-1.1-1.9-2.9-1.9-5.1v-16.5h-4.6v-3.5h4.6v-7.5h3.8v7.5h6.8v3.5h-6.8v15.3c0,1.5.2,2.6.7,3.3s1.4,1.1,2.8,1.1,1.3,0,1.9-.2,1.1-.3,1.5-.5v3.6c-.5.2-1.1.3-1.9.5s-1.5.2-2.1.2Z"/>
-      <path d="M402,154.4c-2.5,0-4.7-.5-6.5-1.6-1.8-1-3.3-2.6-4.2-4.7-1-2.1-1.5-4.7-1.5-7.8,0-4.6,1-8,3.1-10.3,2.1-2.3,4.9-3.4,8.5-3.4s5.1.6,6.8,1.9c1.7,1.3,2.9,3,3.7,5.1.7,2.2,1.1,4.6,1.1,7.3h-21.3l.3-3.5h18.5l-1.5.5c-.1-2.6-.8-4.6-2-5.9-1.2-1.3-3.1-2-5.6-2s-3.2.3-4.3,1c-1.1.6-2,1.7-2.6,3.3s-.8,3.8-.8,6.6.8,5.7,2.3,7.3c1.5,1.7,3.6,2.5,6.3,2.5s2.5,0,3.6-.3,2.1-.5,3-.8c.9-.4,1.7-.7,2.4-1.2v3.9c-1.3.6-2.7,1.1-4.2,1.4-1.5.3-3.2.5-5.1.5Z"/>
-      <path d="M419.5,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1-1.6.2-2.4.3c-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M446.4,154.4c-1.9,0-3.5-.2-4.8-.6s-2.6-.9-4-1.6v-4c1.1.6,2.1,1.1,2.9,1.5s1.7.7,2.6.9c.9.2,1.9.3,3,.3,1.8,0,3.2-.4,4.3-1.2,1.1-.8,1.7-1.8,1.7-3s-.3-1.7-.8-2.3-1.2-1-2.1-1.3c-.8-.4-1.7-.7-2.7-1.1-1-.3-2.1-.6-3.1-.9-1-.3-2-.8-2.9-1.3-.9-.5-1.6-1.3-2.1-2.1-.5-.9-.8-2-.8-3.4s.3-2.5.8-3.4c.5-1,1.3-1.7,2.1-2.4.9-.6,1.9-1.1,3-1.4,1.1-.3,2.2-.4,3.3-.4,1.6,0,2.9.2,4.1.6,1.1.4,2.3.9,3.5,1.4v3.8c-1.3-.7-2.5-1.3-3.6-1.7-1.1-.4-2.3-.7-3.8-.7s-2.7.3-3.9.9c-1.1.6-1.7,1.5-1.7,2.7s.3,1.8.9,2.4,1.4,1,2.3,1.4c1,.3,2,.7,3.1,1,.9.3,1.8.6,2.8.9,1,.3,1.8.8,2.7,1.3.8.5,1.5,1.3,2,2.1.5.9.8,2,.8,3.4s-.5,3.4-1.4,4.6-2.2,2.1-3.6,2.7c-1.5.6-3,.8-4.5.8Z"/>
-    </g>
-  </g>
-</svg>
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="180.62mm" height="180.62mm" viewBox="0 0 300 400" xmlns:c2pa="http://c2pa.org/manifest">
-  <rect x="0" y="0" width="300" height="400" fill="none"/>
-  <g fill="#ffffff" transform="translate(3,365) scale(0.13)">
-    <g>
-      <path d="M139.4.8l-.2,62c-34.3,0-63.4,21.8-73.2,51.9C26.4,141,.2,187.8.2,241.3H0l.2-101.3C.2,63.1,62.4.8,139.4.8Z"/>
-      <path d="M139.1,92.5l-.8,62.5c-42.6,0-77.1,38.6-77.1,86.3l1-103.9c0-7.9,1.3-15.5,3.6-22.7,21.2-14.1,46.3-22.3,73.2-22.3Z"/>
-      <path d="M65.9,114.7c-2.3,7.2-3.6,14.8-3.6,22.7l-1,103.9H.2c0-53.5,26.3-100.3,65.7-126.6Z"/>
-    </g>
-    <polygon points="202.8 .4 202.8 92.9 226.2 92.9 226.2 56 259.8 56 259.8 36.1 226.2 36.1 226.2 19.4 265.7 19.4 265.7 0 202.8 .4"/>
-    <polygon points="282.3 -.3 282.3 93 346.1 93 346.1 72.4 306.8 72.4 306.8 55.6 341.7 55.6 341.7 36.4 306.5 36.4 306.5 19.6 346.2 19.6 346.2 -.3 282.3 -.3"/>
-    <polygon points="365.9 92.8 429.5 92.8 429.5 70.9 389.6 70.9 389.6 .2 365 .2 365.9 92.8"/>
-    <polygon points="448 0 471.9 0 471.9 92.5 447.5 92.5 448 0"/>
-    <path d="M485.1,92.5s34.7-44.3,33.4-46.5S485.7,0,485.7,0h29l18.4,24.8L550.1,0h26.6l-29.9,45.4,33.1,46.8h-28.8l-19.3-27.4-18.9,28.1-27.9-.4Z"/>
-    <g>
-      <path d="M210.9,154.1c-1.9,0-3.7-.2-5.3-.7-1.6-.4-3-1-4.2-1.6v-3.9c1.1.6,2.4,1.1,3.9,1.6,1.5.5,3.2.7,5.1.7,3.1,0,5.5-.6,7.2-1.7,1.7-1.2,2.5-2.8,2.5-5s-.8-3.9-2.5-5c-1.7-1.2-4.2-1.7-7.4-1.7h-3.9v-3.7h4c2.6,0,4.5-.5,5.9-1.5,1.4-1,2-2.4,2-4.2s-.3-2.3-1-3.1c-.6-.8-1.6-1.5-2.8-1.9-1.3-.4-2.8-.7-4.6-.7s-3,.2-4.3.6c-1.3.4-2.4.8-3.3,1.3v-3.9c1.1-.5,2.3-.9,3.6-1.3,1.3-.4,2.8-.5,4.5-.5s4,.3,5.5.8c1.5.5,2.7,1.3,3.6,2.2.9.9,1.6,1.9,2,3.1.4,1.1.6,2.3.6,3.4s-.2,2.4-.7,3.3c-.5.9-1,1.7-1.6,2.2-.6.6-1.4,1.1-2.3,1.6,1.3.7,2.3,1.4,3.2,2.1s1.6,1.7,2.2,2.8c.6,1.1,1,2.5,1,4.2s-.2,2.5-.7,3.8c-.5,1.2-1.2,2.4-2.2,3.4s-2.4,1.8-4,2.4c-1.7.6-3.7.9-6.1.9Z"/>
-      <path d="M232.1,153.7v-35.4h11.1c5.5,0,9.7,1.5,12.4,4.4,2.8,3,4.2,7.4,4.2,13.2s-1.4,10.3-4.2,13.2c-2.8,3-6.9,4.5-12.4,4.5h-11.1ZM235.9,150h7c4.5,0,7.8-1.1,9.9-3.4,2-2.3,3.1-5.8,3.1-10.7s-1-8.4-3.1-10.7c-2-2.3-5.3-3.4-9.9-3.4h-7v28.2Z"/>
-      <path d="M291.9,154.4c-.8,0-1.7-.1-2.6-.3-1-.2-1.9-.5-2.8-.8-.9-.3-1.7-.7-2.4-1l1.3-1.3v14.2h-3.8v-33.2c0-1.1.3-2,1-2.7.7-.7,1.6-1.2,2.7-1.6,1.1-.4,2.3-.6,3.5-.8,1.2-.2,2.4-.2,3.5-.2,2.1,0,4.1.4,6,1.3,1.9.9,3.4,2.4,4.6,4.5s1.7,5,1.7,8.6-.5,5.1-1.5,7.1c-1,2-2.4,3.5-4.3,4.6-1.9,1.1-4.2,1.6-6.9,1.6ZM291.9,150.9c1.9,0,3.5-.4,4.8-1.2,1.3-.8,2.2-2,2.8-3.5.6-1.5,1-3.2,1-5.1s-.2-3.7-.6-5.4c-.4-1.7-1.2-3-2.4-4-1.2-1-3-1.5-5.2-1.5s-3.4.2-4.8.6c-1.4.4-2,1-2,1.8v16.4c1.1.6,2.2,1.1,3.3,1.4s2.2.5,3.3.5Z"/>
-      <path d="M311.1,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1c-.8,0-1.6.2-2.4.3-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M330.5,122.5v-4.2h4.2v4.2h-4.2ZM330.8,153.7v-26.4h3.8v26.4h-3.8Z"/>
-      <path d="M342.7,129.3c.8-.4,1.7-.8,2.6-1.1.9-.3,1.8-.6,2.8-.8.9-.2,1.9-.4,2.9-.5,1-.1,2-.2,2.9-.2,2.6,0,4.6.4,6.1,1.1,1.5.8,2.6,1.9,3.3,3.3.7,1.4,1,3.2,1,5.2v17.2h-3.8v-17.2c0-.6,0-1.3-.2-2-.2-.7-.5-1.4-.9-2-.5-.7-1.2-1.2-2.1-1.6s-2.2-.6-3.8-.6-2.2,0-3.4.3-2.4.4-3.6.8v22.4h-3.8v-24.3Z"/>
-      <path d="M380.7,154.1c-1.9,0-3.4-.6-4.7-1.7-1.3-1.1-1.9-2.9-1.9-5.1v-16.5h-4.6v-3.5h4.6v-7.5h3.8v7.5h6.8v3.5h-6.8v15.3c0,1.5.2,2.6.7,3.3s1.4,1.1,2.8,1.1,1.3,0,1.9-.2,1.1-.3,1.5-.5v3.6c-.5.2-1.1.3-1.9.5s-1.5.2-2.1.2Z"/>
-      <path d="M402,154.4c-2.5,0-4.7-.5-6.5-1.6-1.8-1-3.3-2.6-4.2-4.7-1-2.1-1.5-4.7-1.5-7.8,0-4.6,1-8,3.1-10.3,2.1-2.3,4.9-3.4,8.5-3.4s5.1.6,6.8,1.9c1.7,1.3,2.9,3,3.7,5.1.7,2.2,1.1,4.6,1.1,7.3h-21.3l.3-3.5h18.5l-1.5.5c-.1-2.6-.8-4.6-2-5.9-1.2-1.3-3.1-2-5.6-2s-3.2.3-4.3,1c-1.1.6-2,1.7-2.6,3.3s-.8,3.8-.8,6.6.8,5.7,2.3,7.3c1.5,1.7,3.6,2.5,6.3,2.5s2.5,0,3.6-.3,2.1-.5,3-.8c.9-.4,1.7-.7,2.4-1.2v3.9c-1.3.6-2.7,1.1-4.2,1.4-1.5.3-3.2.5-5.1.5Z"/>
-      <path d="M419.5,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1-1.6.2-2.4.3c-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M446.4,154.4c-1.9,0-3.5-.2-4.8-.6s-2.6-.9-4-1.6v-4c1.1.6,2.1,1.1,2.9,1.5s1.7.7,2.6.9c.9.2,1.9.3,3,.3,1.8,0,3.2-.4,4.3-1.2,1.1-.8,1.7-1.8,1.7-3s-.3-1.7-.8-2.3-1.2-1-2.1-1.3c-.8-.4-1.7-.7-2.7-1.1-1-.3-2.1-.6-3.1-.9-1-.3-2-.8-2.9-1.3-.9-.5-1.6-1.3-2.1-2.1-.5-.9-.8-2-.8-3.4s.3-2.5.8-3.4c.5-1,1.3-1.7,2.1-2.4.9-.6,1.9-1.1,3-1.4,1.1-.3,2.2-.4,3.3-.4,1.6,0,2.9.2,4.1.6,1.1.4,2.3.9,3.5,1.4v3.8c-1.3-.7-2.5-1.3-3.6-1.7-1.1-.4-2.3-.7-3.8-.7s-2.7.3-3.9.9c-1.1.6-1.7,1.5-1.7,2.7s.3,1.8.9,2.4,1.4,1,2.3,1.4c1,.3,2,.7,3.1,1,.9.3,1.8.6,2.8.9,1,.3,1.8.8,2.7,1.3.8.5,1.5,1.3,2,2.1.5.9.8,2,.8,3.4s-.5,3.4-1.4,4.6-2.2,2.1-3.6,2.7c-1.5.6-3,.8-4.5.8Z"/>
-    </g>
-  </g>
-</svg>
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="180.62mm" height="180.62mm" viewBox="0 0 235 244" xmlns:c2pa="http://c2pa.org/manifest">
-  <rect x="0" y="0" width="235" height="244" fill="none"/>
-  <g fill="#ffffff" transform="translate(2,215) scale(0.1)">
-    <g>
-      <path d="M139.4.8l-.2,62c-34.3,0-63.4,21.8-73.2,51.9C26.4,141,.2,187.8.2,241.3H0l.2-101.3C.2,63.1,62.4.8,139.4.8Z"/>
-      <path d="M139.1,92.5l-.8,62.5c-42.6,0-77.1,38.6-77.1,86.3l1-103.9c0-7.9,1.3-15.5,3.6-22.7,21.2-14.1,46.3-22.3,73.2-22.3Z"/>
-      <path d="M65.9,114.7c-2.3,7.2-3.6,14.8-3.6,22.7l-1,103.9H.2c0-53.5,26.3-100.3,65.7-126.6Z"/>
-    </g>
-    <polygon points="202.8 .4 202.8 92.9 226.2 92.9 226.2 56 259.8 56 259.8 36.1 226.2 36.1 226.2 19.4 265.7 19.4 265.7 0 202.8 .4"/>
-    <polygon points="282.3 -.3 282.3 93 346.1 93 346.1 72.4 306.8 72.4 306.8 55.6 341.7 55.6 341.7 36.4 306.5 36.4 306.5 19.6 346.2 19.6 346.2 -.3 282.3 -.3"/>
-    <polygon points="365.9 92.8 429.5 92.8 429.5 70.9 389.6 70.9 389.6 .2 365 .2 365.9 92.8"/>
-    <polygon points="448 0 471.9 0 471.9 92.5 447.5 92.5 448 0"/>
-    <path d="M485.1,92.5s34.7-44.3,33.4-46.5S485.7,0,485.7,0h29l18.4,24.8L550.1,0h26.6l-29.9,45.4,33.1,46.8h-28.8l-19.3-27.4-18.9,28.1-27.9-.4Z"/>
-    <g>
-      <path d="M210.9,154.1c-1.9,0-3.7-.2-5.3-.7-1.6-.4-3-1-4.2-1.6v-3.9c1.1.6,2.4,1.1,3.9,1.6,1.5.5,3.2.7,5.1.7,3.1,0,5.5-.6,7.2-1.7,1.7-1.2,2.5-2.8,2.5-5s-.8-3.9-2.5-5c-1.7-1.2-4.2-1.7-7.4-1.7h-3.9v-3.7h4c2.6,0,4.5-.5,5.9-1.5,1.4-1,2-2.4,2-4.2s-.3-2.3-1-3.1c-.6-.8-1.6-1.5-2.8-1.9-1.3-.4-2.8-.7-4.6-.7s-3,.2-4.3.6c-1.3.4-2.4.8-3.3,1.3v-3.9c1.1-.5,2.3-.9,3.6-1.3,1.3-.4,2.8-.5,4.5-.5s4,.3,5.5.8c1.5.5,2.7,1.3,3.6,2.2.9.9,1.6,1.9,2,3.1.4,1.1.6,2.3.6,3.4s-.2,2.4-.7,3.3c-.5.9-1,1.7-1.6,2.2-.6.6-1.4,1.1-2.3,1.6,1.3.7,2.3,1.4,3.2,2.1s1.6,1.7,2.2,2.8c.6,1.1,1,2.5,1,4.2s-.2,2.5-.7,3.8c-.5,1.2-1.2,2.4-2.2,3.4s-2.4,1.8-4,2.4c-1.7.6-3.7.9-6.1.9Z"/>
-      <path d="M232.1,153.7v-35.4h11.1c5.5,0,9.7,1.5,12.4,4.4,2.8,3,4.2,7.4,4.2,13.2s-1.4,10.3-4.2,13.2c-2.8,3-6.9,4.5-12.4,4.5h-11.1ZM235.9,150h7c4.5,0,7.8-1.1,9.9-3.4,2-2.3,3.1-5.8,3.1-10.7s-1-8.4-3.1-10.7c-2-2.3-5.3-3.4-9.9-3.4h-7v28.2Z"/>
-      <path d="M291.9,154.4c-.8,0-1.7-.1-2.6-.3-1-.2-1.9-.5-2.8-.8-.9-.3-1.7-.7-2.4-1l1.3-1.3v14.2h-3.8v-33.2c0-1.1.3-2,1-2.7.7-.7,1.6-1.2,2.7-1.6,1.1-.4,2.3-.6,3.5-.8,1.2-.2,2.4-.2,3.5-.2,2.1,0,4.1.4,6,1.3,1.9.9,3.4,2.4,4.6,4.5s1.7,5,1.7,8.6-.5,5.1-1.5,7.1c-1,2-2.4,3.5-4.3,4.6-1.9,1.1-4.2,1.6-6.9,1.6ZM291.9,150.9c1.9,0,3.5-.4,4.8-1.2,1.3-.8,2.2-2,2.8-3.5.6-1.5,1-3.2,1-5.1s-.2-3.7-.6-5.4c-.4-1.7-1.2-3-2.4-4-1.2-1-3-1.5-5.2-1.5s-3.4.2-4.8.6c-1.4.4-2,1-2,1.8v16.4c1.1.6,2.2,1.1,3.3,1.4s2.2.5,3.3.5Z"/>
-      <path d="M311.1,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1c-.8,0-1.6.2-2.4.3-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M330.5,122.5v-4.2h4.2v4.2h-4.2ZM330.8,153.7v-26.4h3.8v26.4h-3.8Z"/>
-      <path d="M342.7,129.3c.8-.4,1.7-.8,2.6-1.1.9-.3,1.8-.6,2.8-.8.9-.2,1.9-.4,2.9-.5,1-.1,2-.2,2.9-.2,2.6,0,4.6.4,6.1,1.1,1.5.8,2.6,1.9,3.3,3.3.7,1.4,1,3.2,1,5.2v17.2h-3.8v-17.2c0-.6,0-1.3-.2-2-.2-.7-.5-1.4-.9-2-.5-.7-1.2-1.2-2.1-1.6s-2.2-.6-3.8-.6-2.2,0-3.4.3-2.4.4-3.6.8v22.4h-3.8v-24.3Z"/>
-      <path d="M380.7,154.1c-1.9,0-3.4-.6-4.7-1.7-1.3-1.1-1.9-2.9-1.9-5.1v-16.5h-4.6v-3.5h4.6v-7.5h3.8v7.5h6.8v3.5h-6.8v15.3c0,1.5.2,2.6.7,3.3s1.4,1.1,2.8,1.1,1.3,0,1.9-.2,1.1-.3,1.5-.5v3.6c-.5.2-1.1.3-1.9.5s-1.5.2-2.1.2Z"/>
-      <path d="M402,154.4c-2.5,0-4.7-.5-6.5-1.6-1.8-1-3.3-2.6-4.2-4.7-1-2.1-1.5-4.7-1.5-7.8,0-4.6,1-8,3.1-10.3,2.1-2.3,4.9-3.4,8.5-3.4s5.1.6,6.8,1.9c1.7,1.3,2.9,3,3.7,5.1.7,2.2,1.1,4.6,1.1,7.3h-21.3l.3-3.5h18.5l-1.5.5c-.1-2.6-.8-4.6-2-5.9-1.2-1.3-3.1-2-5.6-2s-3.2.3-4.3,1c-1.1.6-2,1.7-2.6,3.3s-.8,3.8-.8,6.6.8,5.7,2.3,7.3c1.5,1.7,3.6,2.5,6.3,2.5s2.5,0,3.6-.3,2.1-.5,3-.8c.9-.4,1.7-.7,2.4-1.2v3.9c-1.3.6-2.7,1.1-4.2,1.4-1.5.3-3.2.5-5.1.5Z"/>
-      <path d="M419.5,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1-1.6.2-2.4.3c-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M446.4,154.4c-1.9,0-3.5-.2-4.8-.6s-2.6-.9-4-1.6v-4c1.1.6,2.1,1.1,2.9,1.5s1.7.7,2.6.9c.9.2,1.9.3,3,.3,1.8,0,3.2-.4,4.3-1.2,1.1-.8,1.7-1.8,1.7-3s-.3-1.7-.8-2.3-1.2-1-2.1-1.3c-.8-.4-1.7-.7-2.7-1.1-1-.3-2.1-.6-3.1-.9-1-.3-2-.8-2.9-1.3-.9-.5-1.6-1.3-2.1-2.1-.5-.9-.8-2-.8-3.4s.3-2.5.8-3.4c.5-1,1.3-1.7,2.1-2.4.9-.6,1.9-1.1,3-1.4,1.1-.3,2.2-.4,3.3-.4,1.6,0,2.9.2,4.1.6,1.1.4,2.3.9,3.5,1.4v3.8c-1.3-.7-2.5-1.3-3.6-1.7-1.1-.4-2.3-.7-3.8-.7s-2.7.3-3.9.9c-1.1.6-1.7,1.5-1.7,2.7s.3,1.8.9,2.4,1.4,1,2.3,1.4c1,.3,2,.7,3.1,1,.9.3,1.8.6,2.8.9,1,.3,1.8.8,2.7,1.3.8.5,1.5,1.3,2,2.1.5.9.8,2,.8,3.4s-.5,3.4-1.4,4.6-2.2,2.1-3.6,2.7c-1.5.6-3,.8-4.5.8Z"/>
-    </g>
-  </g>
-</svg>
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="180.62mm" height="180.62mm" viewBox="0 0 600 400" xmlns:c2pa="http://c2pa.org/manifest">
-  <rect x="0" y="0" width="600" height="400" fill="none"/>
-  <g fill="#ffffff" transform="translate(4,357) scale(0.16)">
-    <g>
-      <path d="M139.4.8l-.2,62c-34.3,0-63.4,21.8-73.2,51.9C26.4,141,.2,187.8.2,241.3H0l.2-101.3C.2,63.1,62.4.8,139.4.8Z"/>
-      <path d="M139.1,92.5l-.8,62.5c-42.6,0-77.1,38.6-77.1,86.3l1-103.9c0-7.9,1.3-15.5,3.6-22.7,21.2-14.1,46.3-22.3,73.2-22.3Z"/>
-      <path d="M65.9,114.7c-2.3,7.2-3.6,14.8-3.6,22.7l-1,103.9H.2c0-53.5,26.3-100.3,65.7-126.6Z"/>
-    </g>
-    <polygon points="202.8 .4 202.8 92.9 226.2 92.9 226.2 56 259.8 56 259.8 36.1 226.2 36.1 226.2 19.4 265.7 19.4 265.7 0 202.8 .4"/>
-    <polygon points="282.3 -.3 282.3 93 346.1 93 346.1 72.4 306.8 72.4 306.8 55.6 341.7 55.6 341.7 36.4 306.5 36.4 306.5 19.6 346.2 19.6 346.2 -.3 282.3 -.3"/>
-    <polygon points="365.9 92.8 429.5 92.8 429.5 70.9 389.6 70.9 389.6 .2 365 .2 365.9 92.8"/>
-    <polygon points="448 0 471.9 0 471.9 92.5 447.5 92.5 448 0"/>
-    <path d="M485.1,92.5s34.7-44.3,33.4-46.5S485.7,0,485.7,0h29l18.4,24.8L550.1,0h26.6l-29.9,45.4,33.1,46.8h-28.8l-19.3-27.4-18.9,28.1-27.9-.4Z"/>
-    <g>
-      <path d="M210.9,154.1c-1.9,0-3.7-.2-5.3-.7-1.6-.4-3-1-4.2-1.6v-3.9c1.1.6,2.4,1.1,3.9,1.6,1.5.5,3.2.7,5.1.7,3.1,0,5.5-.6,7.2-1.7,1.7-1.2,2.5-2.8,2.5-5s-.8-3.9-2.5-5c-1.7-1.2-4.2-1.7-7.4-1.7h-3.9v-3.7h4c2.6,0,4.5-.5,5.9-1.5,1.4-1,2-2.4,2-4.2s-.3-2.3-1-3.1c-.6-.8-1.6-1.5-2.8-1.9-1.3-.4-2.8-.7-4.6-.7s-3,.2-4.3.6c-1.3.4-2.4.8-3.3,1.3v-3.9c1.1-.5,2.3-.9,3.6-1.3,1.3-.4,2.8-.5,4.5-.5s4,.3,5.5.8c1.5.5,2.7,1.3,3.6,2.2.9.9,1.6,1.9,2,3.1.4,1.1.6,2.3.6,3.4s-.2,2.4-.7,3.3c-.5.9-1,1.7-1.6,2.2-.6.6-1.4,1.1-2.3,1.6,1.3.7,2.3,1.4,3.2,2.1s1.6,1.7,2.2,2.8c.6,1.1,1,2.5,1,4.2s-.2,2.5-.7,3.8c-.5,1.2-1.2,2.4-2.2,3.4s-2.4,1.8-4,2.4c-1.7.6-3.7.9-6.1.9Z"/>
-      <path d="M232.1,153.7v-35.4h11.1c5.5,0,9.7,1.5,12.4,4.4,2.8,3,4.2,7.4,4.2,13.2s-1.4,10.3-4.2,13.2c-2.8,3-6.9,4.5-12.4,4.5h-11.1ZM235.9,150h7c4.5,0,7.8-1.1,9.9-3.4,2-2.3,3.1-5.8,3.1-10.7s-1-8.4-3.1-10.7c-2-2.3-5.3-3.4-9.9-3.4h-7v28.2Z"/>
-      <path d="M291.9,154.4c-.8,0-1.7-.1-2.6-.3-1-.2-1.9-.5-2.8-.8-.9-.3-1.7-.7-2.4-1l1.3-1.3v14.2h-3.8v-33.2c0-1.1.3-2,1-2.7.7-.7,1.6-1.2,2.7-1.6,1.1-.4,2.3-.6,3.5-.8,1.2-.2,2.4-.2,3.5-.2,2.1,0,4.1.4,6,1.3,1.9.9,3.4,2.4,4.6,4.5s1.7,5,1.7,8.6-.5,5.1-1.5,7.1c-1,2-2.4,3.5-4.3,4.6-1.9,1.1-4.2,1.6-6.9,1.6ZM291.9,150.9c1.9,0,3.5-.4,4.8-1.2,1.3-.8,2.2-2,2.8-3.5.6-1.5,1-3.2,1-5.1s-.2-3.7-.6-5.4c-.4-1.7-1.2-3-2.4-4-1.2-1-3-1.5-5.2-1.5s-3.4.2-4.8.6c-1.4.4-2,1-2,1.8v16.4c1.1.6,2.2,1.1,3.3,1.4s2.2.5,3.3.5Z"/>
-      <path d="M311.1,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1c-.8,0-1.6.2-2.4.3-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M330.5,122.5v-4.2h4.2v4.2h-4.2ZM330.8,153.7v-26.4h3.8v26.4h-3.8Z"/>
-      <path d="M342.7,129.3c.8-.4,1.7-.8,2.6-1.1.9-.3,1.8-.6,2.8-.8.9-.2,1.9-.4,2.9-.5,1-.1,2-.2,2.9-.2,2.6,0,4.6.4,6.1,1.1,1.5.8,2.6,1.9,3.3,3.3.7,1.4,1,3.2,1,5.2v17.2h-3.8v-17.2c0-.6,0-1.3-.2-2-.2-.7-.5-1.4-.9-2-.5-.7-1.2-1.2-2.1-1.6s-2.2-.6-3.8-.6-2.2,0-3.4.3-2.4.4-3.6.8v22.4h-3.8v-24.3Z"/>
-      <path d="M380.7,154.1c-1.9,0-3.4-.6-4.7-1.7-1.3-1.1-1.9-2.9-1.9-5.1v-16.5h-4.6v-3.5h4.6v-7.5h3.8v7.5h6.8v3.5h-6.8v15.3c0,1.5.2,2.6.7,3.3s1.4,1.1,2.8,1.1,1.3,0,1.9-.2,1.1-.3,1.5-.5v3.6c-.5.2-1.1.3-1.9.5s-1.5.2-2.1.2Z"/>
-      <path d="M402,154.4c-2.5,0-4.7-.5-6.5-1.6-1.8-1-3.3-2.6-4.2-4.7-1-2.1-1.5-4.7-1.5-7.8,0-4.6,1-8,3.1-10.3,2.1-2.3,4.9-3.4,8.5-3.4s5.1.6,6.8,1.9c1.7,1.3,2.9,3,3.7,5.1.7,2.2,1.1,4.6,1.1,7.3h-21.3l.3-3.5h18.5l-1.5.5c-.1-2.6-.8-4.6-2-5.9-1.2-1.3-3.1-2-5.6-2s-3.2.3-4.3,1c-1.1.6-2,1.7-2.6,3.3s-.8,3.8-.8,6.6.8,5.7,2.3,7.3c1.5,1.7,3.6,2.5,6.3,2.5s2.5,0,3.6-.3,2.1-.5,3-.8c.9-.4,1.7-.7,2.4-1.2v3.9c-1.3.6-2.7,1.1-4.2,1.4-1.5.3-3.2.5-5.1.5Z"/>
-      <path d="M419.5,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1-1.6.2-2.4.3c-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M446.4,154.4c-1.9,0-3.5-.2-4.8-.6s-2.6-.9-4-1.6v-4c1.1.6,2.1,1.1,2.9,1.5s1.7.7,2.6.9c.9.2,1.9.3,3,.3,1.8,0,3.2-.4,4.3-1.2,1.1-.8,1.7-1.8,1.7-3s-.3-1.7-.8-2.3-1.2-1-2.1-1.3c-.8-.4-1.7-.7-2.7-1.1-1-.3-2.1-.6-3.1-.9-1-.3-2-.8-2.9-1.3-.9-.5-1.6-1.3-2.1-2.1-.5-.9-.8-2-.8-3.4s.3-2.5.8-3.4c.5-1,1.3-1.7,2.1-2.4.9-.6,1.9-1.1,3-1.4,1.1-.3,2.2-.4,3.3-.4,1.6,0,2.9.2,4.1.6,1.1.4,2.3.9,3.5,1.4v3.8c-1.3-.7-2.5-1.3-3.6-1.7-1.1-.4-2.3-.7-3.8-.7s-2.7.3-3.9.9c-1.1.6-1.7,1.5-1.7,2.7s.3,1.8.9,2.4,1.4,1,2.3,1.4c1,.3,2,.7,3.1,1,.9.3,1.8.6,2.8.9,1,.3,1.8.8,2.7,1.3.8.5,1.5,1.3,2,2.1.5.9.8,2,.8,3.4s-.5,3.4-1.4,4.6-2.2,2.1-3.6,2.7c-1.5.6-3,.8-4.5.8Z"/>
-    </g>
-  </g>
-</svg>
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="180.62mm" height="180.62mm" viewBox="0 0 205 255" xmlns:c2pa="http://c2pa.org/manifest">
-  <rect x="0" y="0" width="205" height="255" fill="none"/>
-  <g fill="#ffffff" transform="translate(3,228) scale(0.1)">
-    <g>
-      <path d="M139.4.8l-.2,62c-34.3,0-63.4,21.8-73.2,51.9C26.4,141,.2,187.8.2,241.3H0l.2-101.3C.2,63.1,62.4.8,139.4.8Z"/>
-      <path d="M139.1,92.5l-.8,62.5c-42.6,0-77.1,38.6-77.1,86.3l1-103.9c0-7.9,1.3-15.5,3.6-22.7,21.2-14.1,46.3-22.3,73.2-22.3Z"/>
-      <path d="M65.9,114.7c-2.3,7.2-3.6,14.8-3.6,22.7l-1,103.9H.2c0-53.5,26.3-100.3,65.7-126.6Z"/>
-    </g>
-    <polygon points="202.8 .4 202.8 92.9 226.2 92.9 226.2 56 259.8 56 259.8 36.1 226.2 36.1 226.2 19.4 265.7 19.4 265.7 0 202.8 .4"/>
-    <polygon points="282.3 -.3 282.3 93 346.1 93 346.1 72.4 306.8 72.4 306.8 55.6 341.7 55.6 341.7 36.4 306.5 36.4 306.5 19.6 346.2 19.6 346.2 -.3 282.3 -.3"/>
-    <polygon points="365.9 92.8 429.5 92.8 429.5 70.9 389.6 70.9 389.6 .2 365 .2 365.9 92.8"/>
-    <polygon points="448 0 471.9 0 471.9 92.5 447.5 92.5 448 0"/>
-    <path d="M485.1,92.5s34.7-44.3,33.4-46.5S485.7,0,485.7,0h29l18.4,24.8L550.1,0h26.6l-29.9,45.4,33.1,46.8h-28.8l-19.3-27.4-18.9,28.1-27.9-.4Z"/>
-    <g>
-      <path d="M210.9,154.1c-1.9,0-3.7-.2-5.3-.7-1.6-.4-3-1-4.2-1.6v-3.9c1.1.6,2.4,1.1,3.9,1.6,1.5.5,3.2.7,5.1.7,3.1,0,5.5-.6,7.2-1.7,1.7-1.2,2.5-2.8,2.5-5s-.8-3.9-2.5-5c-1.7-1.2-4.2-1.7-7.4-1.7h-3.9v-3.7h4c2.6,0,4.5-.5,5.9-1.5,1.4-1,2-2.4,2-4.2s-.3-2.3-1-3.1c-.6-.8-1.6-1.5-2.8-1.9-1.3-.4-2.8-.7-4.6-.7s-3,.2-4.3.6c-1.3.4-2.4.8-3.3,1.3v-3.9c1.1-.5,2.3-.9,3.6-1.3,1.3-.4,2.8-.5,4.5-.5s4,.3,5.5.8c1.5.5,2.7,1.3,3.6,2.2.9.9,1.6,1.9,2,3.1.4,1.1.6,2.3.6,3.4s-.2,2.4-.7,3.3c-.5.9-1,1.7-1.6,2.2-.6.6-1.4,1.1-2.3,1.6,1.3.7,2.3,1.4,3.2,2.1s1.6,1.7,2.2,2.8c.6,1.1,1,2.5,1,4.2s-.2,2.5-.7,3.8c-.5,1.2-1.2,2.4-2.2,3.4s-2.4,1.8-4,2.4c-1.7.6-3.7.9-6.1.9Z"/>
-      <path d="M232.1,153.7v-35.4h11.1c5.5,0,9.7,1.5,12.4,4.4,2.8,3,4.2,7.4,4.2,13.2s-1.4,10.3-4.2,13.2c-2.8,3-6.9,4.5-12.4,4.5h-11.1ZM235.9,150h7c4.5,0,7.8-1.1,9.9-3.4,2-2.3,3.1-5.8,3.1-10.7s-1-8.4-3.1-10.7c-2-2.3-5.3-3.4-9.9-3.4h-7v28.2Z"/>
-      <path d="M291.9,154.4c-.8,0-1.7-.1-2.6-.3-1-.2-1.9-.5-2.8-.8-.9-.3-1.7-.7-2.4-1l1.3-1.3v14.2h-3.8v-33.2c0-1.1.3-2,1-2.7.7-.7,1.6-1.2,2.7-1.6,1.1-.4,2.3-.6,3.5-.8,1.2-.2,2.4-.2,3.5-.2,2.1,0,4.1.4,6,1.3,1.9.9,3.4,2.4,4.6,4.5s1.7,5,1.7,8.6-.5,5.1-1.5,7.1c-1,2-2.4,3.5-4.3,4.6-1.9,1.1-4.2,1.6-6.9,1.6ZM291.9,150.9c1.9,0,3.5-.4,4.8-1.2,1.3-.8,2.2-2,2.8-3.5.6-1.5,1-3.2,1-5.1s-.2-3.7-.6-5.4c-.4-1.7-1.2-3-2.4-4-1.2-1-3-1.5-5.2-1.5s-3.4.2-4.8.6c-1.4.4-2,1-2,1.8v16.4c1.1.6,2.2,1.1,3.3,1.4s2.2.5,3.3.5Z"/>
-      <path d="M311.1,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1c-.8,0-1.6.2-2.4.3-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M330.5,122.5v-4.2h4.2v4.2h-4.2ZM330.8,153.7v-26.4h3.8v26.4h-3.8Z"/>
-      <path d="M342.7,129.3c.8-.4,1.7-.8,2.6-1.1.9-.3,1.8-.6,2.8-.8.9-.2,1.9-.4,2.9-.5,1-.1,2-.2,2.9-.2,2.6,0,4.6.4,6.1,1.1,1.5.8,2.6,1.9,3.3,3.3.7,1.4,1,3.2,1,5.2v17.2h-3.8v-17.2c0-.6,0-1.3-.2-2-.2-.7-.5-1.4-.9-2-.5-.7-1.2-1.2-2.1-1.6s-2.2-.6-3.8-.6-2.2,0-3.4.3-2.4.4-3.6.8v22.4h-3.8v-24.3Z"/>
-      <path d="M380.7,154.1c-1.9,0-3.4-.6-4.7-1.7-1.3-1.1-1.9-2.9-1.9-5.1v-16.5h-4.6v-3.5h4.6v-7.5h3.8v7.5h6.8v3.5h-6.8v15.3c0,1.5.2,2.6.7,3.3s1.4,1.1,2.8,1.1,1.3,0,1.9-.2,1.1-.3,1.5-.5v3.6c-.5.2-1.1.3-1.9.5s-1.5.2-2.1.2Z"/>
-      <path d="M402,154.4c-2.5,0-4.7-.5-6.5-1.6-1.8-1-3.3-2.6-4.2-4.7-1-2.1-1.5-4.7-1.5-7.8,0-4.6,1-8,3.1-10.3,2.1-2.3,4.9-3.4,8.5-3.4s5.1.6,6.8,1.9c1.7,1.3,2.9,3,3.7,5.1.7,2.2,1.1,4.6,1.1,7.3h-21.3l.3-3.5h18.5l-1.5.5c-.1-2.6-.8-4.6-2-5.9-1.2-1.3-3.1-2-5.6-2s-3.2.3-4.3,1c-1.1.6-2,1.7-2.6,3.3s-.8,3.8-.8,6.6.8,5.7,2.3,7.3c1.5,1.7,3.6,2.5,6.3,2.5s2.5,0,3.6-.3,2.1-.5,3-.8c.9-.4,1.7-.7,2.4-1.2v3.9c-1.3.6-2.7,1.1-4.2,1.4-1.5.3-3.2.5-5.1.5Z"/>
-      <path d="M419.5,153.7v-24.3c.4-.2,1.2-.5,2.5-.9,1.2-.4,2.7-.8,4.4-1.2,1.7-.4,3.5-.5,5.3-.5s.6,0,.8.1c.3,0,.6.1.8.2v3.4c-.9-.1-1.8-.2-2.7-.2s-1.7,0-2.5.1-1.6.2-2.4.3c-.8.1-1.6.3-2.4.4v22.5h-3.8Z"/>
-      <path d="M446.4,154.4c-1.9,0-3.5-.2-4.8-.6s-2.6-.9-4-1.6v-4c1.1.6,2.1,1.1,2.9,1.5s1.7.7,2.6.9c.9.2,1.9.3,3,.3,1.8,0,3.2-.4,4.3-1.2,1.1-.8,1.7-1.8,1.7-3s-.3-1.7-.8-2.3-1.2-1-2.1-1.3c-.8-.4-1.7-.7-2.7-1.1-1-.3-2.1-.6-3.1-.9-1-.3-2-.8-2.9-1.3-.9-.5-1.6-1.3-2.1-2.1-.5-.9-.8-2-.8-3.4s.3-2.5.8-3.4c.5-1,1.3-1.7,2.1-2.4.9-.6,1.9-1.1,3-1.4,1.1-.3,2.2-.4,3.3-.4,1.6,0,2.9.2,4.1.6,1.1.4,2.3.9,3.5,1.4v3.8c-1.3-.7-2.5-1.3-3.6-1.7-1.1-.4-2.3-.7-3.8-.7s-2.7.3-3.9.9c-1.1.6-1.7,1.5-1.7,2.7s.3,1.8.9,2.4,1.4,1,2.3,1.4c1,.3,2,.7,3.1,1,.9.3,1.8.6,2.8.9,1,.3,1.8.8,2.7,1.3.8.5,1.5,1.3,2,2.1.5.9.8,2,.8,3.4s-.5,3.4-1.4,4.6-2.2,2.1-3.6,2.7c-1.5.6-3,.8-4.5.8Z"/>
-    </g>
-  </g>
-</svg>
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Plastic Syringe @0.50mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "IQnumbi0N4BnvMfO",
-	"filament_id": "OFAzgHcF",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 0.50mm nozzle",
-		"FELIX Food Double 0.50mm nozzle",
-		"FELIX Food Switch 0.50mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"3.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"6.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"0.75"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"7.2"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Plastic Syringe @1.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "p8CG6dHMUxNl7iPL",
-	"filament_id": "OFAzgHcF",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 1.00mm nozzle",
-		"FELIX Food Double 1.00mm nozzle",
-		"FELIX Food Switch 1.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"3.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"6.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"1.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"27.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Plastic Syringe @2.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "s5uPS7I3E57tiRRC",
-	"filament_id": "OFAzgHcF",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 2.00mm nozzle",
-		"FELIX Food Double 2.00mm nozzle",
-		"FELIX Food Switch 2.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"3.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"6.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"3.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"108.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Plastic Syringe @3.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "zlZtghh6ytU7N09m",
-	"filament_id": "OFAzgHcF",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 3.00mm nozzle",
-		"FELIX Food Double 3.00mm nozzle",
-		"FELIX Food Switch 3.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"3.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"6.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"4.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"216.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Plastic Syringe @4.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "fvTZEcREMbs3JW1D",
-	"filament_id": "OFAzgHcF",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 4.00mm nozzle",
-		"FELIX Food Double 4.00mm nozzle",
-		"FELIX Food Switch 4.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"3.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"6.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"6.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"432.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Stainless Steel Syringe @0.50mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "2XyqnzMqyuRCqpPq",
-	"filament_id": "OFqZSD1S",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 0.50mm nozzle",
-		"FELIX Food Double 0.50mm nozzle",
-		"FELIX Food Switch 0.50mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"1.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"10.0"
-	],
-	"filament_deretraction_speed": [
-		"10.0"
-	],
-	"filament_retract_length_toolchange": [
-		"2.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"0.75"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"7.2"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Stainless Steel Syringe @1.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "yNxVUGOb1kUbXLiw",
-	"filament_id": "OFqZSD1S",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 1.00mm nozzle",
-		"FELIX Food Double 1.00mm nozzle",
-		"FELIX Food Switch 1.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"1.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"10.0"
-	],
-	"filament_deretraction_speed": [
-		"10.0"
-	],
-	"filament_retract_length_toolchange": [
-		"2.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"1.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"27.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Stainless Steel Syringe @2.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "4MhgYDnGFKLfurhc",
-	"filament_id": "OFqZSD1S",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 2.00mm nozzle",
-		"FELIX Food Double 2.00mm nozzle",
-		"FELIX Food Switch 2.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"1.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"10.0"
-	],
-	"filament_deretraction_speed": [
-		"10.0"
-	],
-	"filament_retract_length_toolchange": [
-		"2.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"3.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"108.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Stainless Steel Syringe @3.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "mEH3Rgzzwjq9iptd",
-	"filament_id": "OFqZSD1S",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 3.00mm nozzle",
-		"FELIX Food Double 3.00mm nozzle",
-		"FELIX Food Switch 3.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"1.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"10.0"
-	],
-	"filament_deretraction_speed": [
-		"10.0"
-	],
-	"filament_retract_length_toolchange": [
-		"2.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"4.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"216.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Medium Stainless Steel Syringe @4.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "rJsNSIb8w9kOwhwE",
-	"filament_id": "OFqZSD1S",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 4.00mm nozzle",
-		"FELIX Food Double 4.00mm nozzle",
-		"FELIX Food Switch 4.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.05"
-	],
-	"filament_retraction_length": [
-		"1.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"10.0"
-	],
-	"filament_deretraction_speed": [
-		"10.0"
-	],
-	"filament_retract_length_toolchange": [
-		"2.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"6.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"432.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thick Stainless Steel Syringe @0.50mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "dJzDnkh8Kyn3phhF",
-	"filament_id": "OFjXHG0Z",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 0.50mm nozzle",
-		"FELIX Food Double 0.50mm nozzle",
-		"FELIX Food Switch 0.50mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.02"
-	],
-	"filament_retraction_length": [
-		"2.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"4.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"0.75"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"4.8"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thick Stainless Steel Syringe @1.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "QQi61sD4rX2jELMa",
-	"filament_id": "OFjXHG0Z",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 1.00mm nozzle",
-		"FELIX Food Double 1.00mm nozzle",
-		"FELIX Food Switch 1.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.02"
-	],
-	"filament_retraction_length": [
-		"2.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"4.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"1.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"18.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thick Stainless Steel Syringe @2.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "KUmfC5HZL2hXPfey",
-	"filament_id": "OFjXHG0Z",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 2.00mm nozzle",
-		"FELIX Food Double 2.00mm nozzle",
-		"FELIX Food Switch 2.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.02"
-	],
-	"filament_retraction_length": [
-		"2.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"4.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"3.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"72.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thick Stainless Steel Syringe @3.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "0BbaSUre1bztrKB0",
-	"filament_id": "OFjXHG0Z",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 3.00mm nozzle",
-		"FELIX Food Double 3.00mm nozzle",
-		"FELIX Food Switch 3.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.02"
-	],
-	"filament_retraction_length": [
-		"2.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"4.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"4.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"144.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thick Stainless Steel Syringe @4.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "b179BTbFqjhnsHPT",
-	"filament_id": "OFjXHG0Z",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 4.00mm nozzle",
-		"FELIX Food Double 4.00mm nozzle",
-		"FELIX Food Switch 4.00mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.02"
-	],
-	"filament_retraction_length": [
-		"2.0"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"4.0"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"6.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"288.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thin Plastic Syringe @0.50mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "dBTTG8HJRYb7GHqy",
-	"filament_id": "OF0kP94Y",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 0.50mm nozzle",
-		"FELIX Food Double 0.50mm nozzle",
-		"FELIX Food Switch 0.50mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.1"
-	],
-	"filament_retraction_length": [
-		"0.75"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"1.5"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"0.75"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"10.8"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thin Plastic Syringe @1.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "FITfR7iepAteWuno",
-	"filament_id": "OF0kP94Y",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 1.00mm nozzle",
-		"FELIX Food Double 1.00mm nozzle",
-		"FELIX Food Switch 1.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.1"
-	],
-	"filament_retraction_length": [
-		"0.75"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"1.5"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"1.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"40.5"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thin Plastic Syringe @2.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "i2DZouQfWUnIm4R5",
-	"filament_id": "OF0kP94Y",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 2.00mm nozzle",
-		"FELIX Food Double 2.00mm nozzle",
-		"FELIX Food Switch 2.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.1"
-	],
-	"filament_retraction_length": [
-		"0.75"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"1.5"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"3.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"162.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thin Plastic Syringe @3.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "EzV8T0DVT0NRPa7P",
-	"filament_id": "OF0kP94Y",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 3.00mm nozzle",
-		"FELIX Food Double 3.00mm nozzle",
-		"FELIX Food Switch 3.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.1"
-	],
-	"filament_retraction_length": [
-		"0.75"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"1.5"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"4.5"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"324.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thin Plastic Syringe @4.00mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "Q6msqrC9TM0un5qw",
-	"filament_id": "OF0kP94Y",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 4.00mm nozzle",
-		"FELIX Food Double 4.00mm nozzle",
-		"FELIX Food Switch 4.00mm nozzle"
-	],
-	"filament_diameter": [
-		"31.22"
-	],
-	"filament_flow_ratio": [
-		"1.1"
-	],
-	"filament_retraction_length": [
-		"0.75"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"5.0"
-	],
-	"filament_deretraction_speed": [
-		"5.0"
-	],
-	"filament_retract_length_toolchange": [
-		"1.5"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"6.0"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"648.0"
-	]
-}
@@ -1,47 +0,0 @@
-{
-	"type": "filament",
-	"name": "Food Thin Stainless Steel Syringe @0.50mm",
-	"inherits": "fdm_filament_food",
-	"from": "system",
-	"setting_id": "I9W6tiEnRSMrkyzl",
-	"filament_id": "OF40XIE8",
-	"instantiation": "true",
-	"compatible_printers": [
-		"FELIX Food Single 0.50mm nozzle",
-		"FELIX Food Double 0.50mm nozzle",
-		"FELIX Food Switch 0.50mm nozzle"
-	],
-	"filament_diameter": [
-		"25.4"
-	],
-	"filament_flow_ratio": [
-		"1.1"
-	],
-	"filament_retraction_length": [
-		"0.2"
-	],
-	"filament_retract_restart_extra": [
-		"0.0"
-	],
-	"filament_retraction_speed": [
-		"10.0"
-	],
-	"filament_deretraction_speed": [
-		"10.0"
-	],
-	"filament_retract_length_toolchange": [
-		"0.4"
-	],
-	"filament_retract_restart_extra_toolchange": [
-		"0.0"
-	],
-	"filament_wipe_distance": [
-		"0.75"
-	],
-	"filament_vendor": [
-		"FELIX Printers"
-	],
-	"filament_max_volumetric_speed": [
-		"10.8"
-	]
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rodrigo Faselli	c030131bcc	Merge branch 'main' into perf/slicing-optimizations	2026-10-11 22:39:31 -03:00
Rodrigo Faselli	ac8ac299a5	add missing headers Co-authored-by: Rodrigo Faselli <162915171+RF47@users.noreply.github.com>	2026-10-11 22:36:16 -03:00
Rodrigo Faselli	0f48982b78	Merge branch 'main' into perf/slicing-optimizations	2026-10-11 15:00:58 -03:00
SoftFever	f6e8821b13	Merge branch 'main' into perf/slicing-optimizations	2026-10-10 01:09:46 +08:00
SoftFever	076d88f34e	Merge branch 'main' into perf/slicing-optimizations	2026-10-09 22:19:27 +08:00
SoftFever	7f554fde04	Restore the internal bridge expansion from #16056 lost in the main merge	2026-10-09 22:11:47 +08:00
SoftFever	d704ee5538	Merge branch 'main' into perf/slicing-optimizations # Conflicts: # src/libslic3r/PerimeterGenerator.cpp # src/libslic3r/PrintObject.cpp # src/libslic3r/Support/TreeSupport.cpp	2026-10-09 19:48:26 +08:00
Rodrigo Faselli	7de1dc1548	Merge branch 'main' into perf/slicing-optimizations	2026-10-04 13:26:02 -03:00
Rodrigo Faselli	b6140110f2	Merge branch 'main' into perf/slicing-optimizations	2026-10-03 10:57:31 -03:00
Ian Bassi	7b0e2f3ce5	Keep the G-code identical to main on Clipper2 Since main moved to Clipper2, parts of this branch no longer gave the same G-code as main: - bridge_over_infill dropped expand(limiting_area, 0.3 * flow.spacing()) as a no-op. The offset is below one unit, but Clipper2 still unites its result, which splits and merges touching polygons and so changes the anchor lines. Running it on the polygons next to the bridge gives main's anchors without the whole-layer pass. - tsp_remove_crossings stopped at the first repeated ordering, where main runs on to its pn * pn cap. The loop is periodic from that point, so it now takes only the steps to the ordering main stops on. - With a single tile, the tiled booleans now make the plain call instead of cutting the clip to the tile first. The tiled boolean test compared rings exactly. With the safety offset a tile unites only the clip polygons near it, and Clipper2 can then round a crossing 1 unit differently, so that case allows 1 unit. Comments that named ClipperLib now say Clipper, and docs/HLSD/polygon-clipping.md describes the tiled booleans. G-code of the five handy models in four configurations and of a baked texture relief is byte-identical to main. Colour-painted models still differ: segmenting each island on its own splits a colour's region into different pieces than one diagram over the layer, which on one model also changes the first layer's tool order.	2026-10-02 20:26:59 -03:00
ExPikaPaka	d80c69341c	Say what the code does, not what it replaced The timings and the runs that never finished belong in the commit messages, where they can be read against the change; a reader of the code cannot check them. Kept the cost that still explains the design. MultiPoint also spells out the consequence: a moved-from Polygon or Polyline is now really empty where it used to silently keep its points. The two wall spacing comments the parallel loop reindented are plain ASCII now, so the whole file is.	2026-10-02 18:13:46 -03:00
ExPikaPaka	4a63a7d916	Compare the tiled booleans polygon by polygon Area alone would pass on a result whose pieces were merged across tiles or which kept the cut edges of the clip. The rings are compared after rotating each to its lowest point and sorting, so only the ordering is free. The fixture now also asserts it really is split into more than one tile, which is the path being tested.	2026-10-02 18:13:46 -03:00
ExPikaPaka	de1dfd0611	Hand the island's walls over instead of copying them append(const ExtrusionEntity &) clones; the collection each island produced was deep-copied into the layer's loops and then thrown away. The no-overlap areas are moved as well.	2026-10-02 18:13:46 -03:00
ExPikaPaka	11a5971cef	Include what the new code uses The Windows build stopped on test_kdtree.cpp: it calls std::iota without including <numeric>, which libstdc++ happens to pull in anyway. Added there, and the same for <limits> and <algorithm>/<cmath> where the recent changes rely on them being included by something else.	2026-10-02 18:13:45 -03:00
ExPikaPaka	82f37ddb3a	Fix the Windows build: near and far are macros there bridge_over_infill's helper for splitting polygons by proximity named its locals near and far. The Windows headers define both as macros that expand to nothing, so "Polygons near;" declared nothing and the uses of it did not compile. Renamed; no behaviour change.	2026-10-02 18:13:37 -03:00
ExPikaPaka	fb03d1a1cb	Visit seam candidates as the search finds them Collecting every candidate within the radius into a vector cost more than the search itself. Same order, so the seams are unchanged; align_seam_points ~19.6 s at 0.1 mm / 2000k, was ~21.	2026-10-02 18:13:37 -03:00
ExPikaPaka	2b4bdead73	Run a layer's regions in parallel where they are independent detect_surfaces_type, process_external_surfaces and the vertical shells each waited on their own heaviest layer in turn. The LOTR map plate slices in ~10.5 min at 0.1 mm / 2000k, was ~11.5; ~87 s at normal settings, was ~97.	2026-10-02 18:13:37 -03:00
ExPikaPaka	b1f0d6c6f6	Move polygons instead of copying them on move MultiPoint had no rvalue constructor, so the derived move constructors bound to the const reference and copied; append reserved exactly, so collecting pieces one by one was quadratic. Colour segmentation ~3 s at 0.1 mm / 2000k, was ~40, and ordinary prints gain too.	2026-10-02 18:13:37 -03:00
ExPikaPaka	14751a8b06	Project painted faces onto the shell layers per tile Only the slices within the deepest shell offset decide the result, so the work is done per tile of the face. Top and bottom segmentation ~130 s at 0.1 mm / 2000k, was ~180.	2026-10-02 18:13:36 -03:00
ExPikaPaka	9a86d79038	Tile the booleans on layers of many pieces ClipperLib slows down with the number of edges on a scan line, and a layer cut through a fine relief has tens of thousands of pieces. detect_surfaces_type ~50 s at 0.1 mm / 2000k, was ~145.	2026-10-02 18:13:05 -03:00
ExPikaPaka	d905f1a39b	Merge colour and top/bottom regions per island The merge took anything from 3 to 38 minutes at 0.1 mm / 2000k, now ~2.5. Every region is grouped with the islands it overlaps, so the result is the same.	2026-10-02 18:12:41 -03:00
ExPikaPaka	84ec518f26	Slice fine texture relief without stalling A colour texture baked at 0.1 mm / 2000k made the top layers thousands of islands and slicing never finished. Colour segmentation runs per island, the merge subtracts piece by piece, the support check tests only nearby islands, and the travel ordering finds crossings through a grid.	2026-10-02 18:12:41 -03:00
ExPikaPaka	1fc153308f	Generate walls and split solid infill in parallel Same output, ~2.2 min for the LOTR map plate, was ~2.6.	2026-10-02 18:12:41 -03:00
ExPikaPaka	3167c3665a	Run colour segmentation and vertical shells in parallel Same output, ~2.6 min for the LOTR map plate, was ~2.9.	2026-10-02 18:12:40 -03:00
ExPikaPaka	6d34d83e78	Faster slicing of colour-painted layers A layer split into ~1000 colour fragments (a colour texture baked over a large top face) made several per-fragment loops redo whole-layer ClipperLib work, so slicing took ~33 min; it now takes ~3 min with the same output. - make_fills: clip the layer's no-overlap area to each expolygon's box before intersecting - discover_vertical_shells: small-piece filter compares only against the nearby part of the layer - bridge_over_infill: whole-layer union/diff/intersections restricted to the candidate's neighbourhood; fill boundary expanded once per spacing; anchor tree built only from lines crossing the scan range; bbox pre-check in the collision test; limiting outline taken directly instead of through expand(..., 0.3 * flow.spacing()), which offsets by 0.135 scaled units (flow.spacing() is in mm) and only cost a whole-layer pass per candidate	2026-10-02 18:11:17 -03:00