diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 666383c8f9..ad0a7ea587 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -45,10 +45,3 @@ jobs: with: name: printer-linter-result path: printer-linter-result/ - - - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@v1.8.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - clang_tidy_fixes: result.yml - request_changes: true diff --git a/.github/workflows/printer-linter-pr-post.yml b/.github/workflows/printer-linter-pr-post.yml index 7b3dd152cb..d7f43d06dc 100644 --- a/.github/workflows/printer-linter-pr-post.yml +++ b/.github/workflows/printer-linter-pr-post.yml @@ -103,9 +103,10 @@ jobs: body-path: 'printer-linter-result/comment.md' - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@v1 + uses: platisd/clang-tidy-pr-comments@v1.8.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} clang_tidy_fixes: printer-linter-result/fixes.yml pull_request_id: ${{ env.PR_ID }} request_changes: true + auto_resolve_conversations: true diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index 1974f4c08c..c1869a255c 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -37,6 +37,7 @@ class FormatMaps: "abs-cf10": {"name": "ABS-CF", "guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, "abs-wss1": {"name": "ABS-R", "guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, "asa": {"name": "ASA", "guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, + "nylon": {"name": "Nylon", "guid": "9475b03d-fd19-48a2-b7b5-be1fb46abb02"}, "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, "nylon-cf": {"name": "Nylon CF", "guid": "17abb865-ca73-4ccd-aeda-38e294c9c60b"}, "pet": {"name": "PETG", "guid": "2d004bbd-d1bb-47f8-beac-b066702d5273"}, diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 1d0be1389e..0eb55d81c5 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -288,9 +288,11 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): def postFormWithParts(self, target: str, parts: List[QHttpPart], on_finished: Optional[Callable[[QNetworkReply], None]], - on_progress: Optional[Callable[[int, int], None]] = None) -> QNetworkReply: + on_progress: Optional[Callable[[int, int], None]] = None, + request: Optional[QNetworkRequest] = None) -> QNetworkReply: self._validateManager() - request = self._createEmptyRequest(target, content_type=None) + if request is None: + request = self._createEmptyRequest(target, content_type=None) multi_post_part = QHttpMultiPart(QHttpMultiPart.ContentType.FormDataType) for part in parts: multi_post_part.append(part) diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 9f61e6950c..f3bb2572be 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -158,12 +158,10 @@ RmDir /r /REBOOTOK "$INSTDIR" !ifdef REG_START_MENU Delete "$SMPROGRAMS\${APP_NAME}.lnk" -Delete "$SMPROGRAMS\Uninstall ${APP_NAME}.lnk" !endif !ifndef REG_START_MENU Delete "$SMPROGRAMS\${APP_NAME}.lnk" -Delete "$SMPROGRAMS\Uninstall ${APP_NAME}.lnk" !endif !insertmacro APP_UNASSOCIATE "stl" "Cura.model" diff --git a/plugins/PaintTool/PaintTool.py b/plugins/PaintTool/PaintTool.py index e67795301d..18be2ed880 100644 --- a/plugins/PaintTool/PaintTool.py +++ b/plugins/PaintTool/PaintTool.py @@ -1,23 +1,24 @@ # Copyright (c) 2025 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. +import math from enum import IntEnum import numpy -from PyQt6.QtCore import Qt, QObject, pyqtEnum -from PyQt6.QtGui import QImage, QPainter, QColor, QPen -from PyQt6 import QtWidgets -from typing import cast, Dict, List, Optional, Tuple - -from numpy import ndarray +from PyQt6.QtCore import Qt, QObject, pyqtEnum, QPointF +from PyQt6.QtGui import QImage, QPainter, QPen, QBrush, QPolygonF +from typing import cast, Optional, Tuple, List from UM.Application import Application -from UM.Event import Event, MouseEvent, KeyEvent +from UM.Event import Event, MouseEvent from UM.Job import Job from UM.Logger import Logger +from UM.Math.AxisAlignedBox2D import AxisAlignedBox2D +from UM.Math.Polygon import Polygon +from UM.Math.Vector import Vector +from UM.Scene.Camera import Camera from UM.Scene.SceneNode import SceneNode from UM.Scene.Selection import Selection from UM.Tool import Tool -from UM.View.GL.OpenGL import OpenGL from cura.CuraApplication import CuraApplication from cura.PickingPass import PickingPass @@ -58,28 +59,47 @@ class PaintTool(Tool): self._mesh_transformed_cache = None self._cache_dirty: bool = True - self._brush_size: int = 200 + self._brush_size: int = 10 self._brush_color: str = "preferred" + self._brush_extruder: int = 0 self._brush_shape: PaintTool.Brush.Shape = PaintTool.Brush.Shape.CIRCLE self._brush_pen: QPen = self._createBrushPen() self._mouse_held: bool = False - self._last_text_coords: Optional[numpy.ndarray] = None - self._last_mouse_coords: Optional[Tuple[int, int]] = None - self._last_face_id: Optional[int] = None + self._last_world_coords: Optional[numpy.ndarray] = None self._state: PaintTool.Paint.State = PaintTool.Paint.State.MULTIPLE_SELECTION self._prepare_texture_job: Optional[PrepareTextureJob] = None - self.setExposedProperties("PaintType", "BrushSize", "BrushColor", "BrushShape", "State", "CanUndo", "CanRedo") + self.setExposedProperties("PaintType", "BrushSize", "BrushColor", "BrushShape", "BrushExtruder", "State", "CanUndo", "CanRedo") self._controller.activeViewChanged.connect(self._updateIgnoreUnselectedObjects) self._controller.activeToolChanged.connect(self._updateState) + self._camera: Optional[Camera] = None + self._cam_pos: numpy.ndarray = numpy.array([0.0, 0.0, 0.0]) + self._cam_norm: numpy.ndarray = numpy.array([0.0, 0.0, 1.0]) + self._cam_axis_q: numpy.ndarray = numpy.array([1.0, 0.0, 0.0]) + self._cam_axis_r: numpy.ndarray = numpy.array([0.0, -1.0, 0.0]) + + def _updateCamera(self, *args) -> None: + if self._camera is None: + self._camera = Application.getInstance().getController().getScene().getActiveCamera() + self._camera.transformationChanged.connect(self._updateCamera) + self._cam_pos = self._camera.getPosition().getData() + cam_ray = self._camera.getRay(0, 0) + self._cam_norm = cam_ray.direction.getData() + self._cam_norm /= -numpy.linalg.norm(self._cam_norm) + axis_up = numpy.array([0.0, -1.0, 0.0]) if abs(self._cam_norm[1]) < abs(self._cam_norm[2]) else numpy.array([0.0, 0.0, 1.0]) + self._cam_axis_q = numpy.cross(self._cam_norm, axis_up) + self._cam_axis_q /= numpy.linalg.norm(self._cam_axis_q) + self._cam_axis_r = numpy.cross(self._cam_axis_q, self._cam_norm) + self._cam_axis_r /= numpy.linalg.norm(self._cam_axis_r) + def _createBrushPen(self) -> QPen: pen = QPen() - pen.setWidth(self._brush_size) + pen.setWidth(2) pen.setColor(Qt.GlobalColor.white) match self._brush_shape: @@ -87,29 +107,12 @@ class PaintTool(Tool): pen.setCapStyle(Qt.PenCapStyle.SquareCap) case PaintTool.Brush.Shape.CIRCLE: pen.setCapStyle(Qt.PenCapStyle.RoundCap) + case _: + Logger.error(f"Unknown brush shape '{self._brush_shape}', painting may not work.") return pen - def _createStrokeImage(self, x0: float, y0: float, x1: float, y1: float) -> Tuple[QImage, Tuple[int, int]]: - xdiff = int(x1 - x0) - ydiff = int(y1 - y0) - - half_brush_size = self._brush_size // 2 - start_x = int(min(x0, x1) - half_brush_size) - start_y = int(min(y0, y1) - half_brush_size) - - stroke_image = QImage(abs(xdiff) + self._brush_size, abs(ydiff) + self._brush_size, QImage.Format.Format_RGB32) - stroke_image.fill(0) - - painter = QPainter(stroke_image) - painter.setRenderHint(QPainter.RenderHint.Antialiasing, False) - painter.setPen(self._brush_pen) - if xdiff == 0 and ydiff == 0: - painter.drawPoint(int(x0 - start_x), int(y0 - start_y)) - else: - painter.drawLine(int(x0 - start_x), int(y0 - start_y), int(x1 - start_x), int(y1 - start_y)) - painter.end() - - return stroke_image, (start_x, start_y) + def _createStrokeImage(self, polys: List[Polygon]) -> Tuple[QImage, Tuple[int, int]]: + return PaintTool._rasterizePolygons(polys, self._brush_pen, QBrush(self._brush_pen.color())) def getPaintType(self) -> str: return self._view.getPaintType() @@ -140,6 +143,14 @@ class PaintTool(Tool): self._brush_color = brush_color self.propertyChanged.emit() + def getBrushExtruder(self) -> int: + return self._brush_extruder + + def setBrushExtruder(self, brush_extruder: int) -> None: + if brush_extruder != self._brush_extruder: + self._brush_extruder = brush_extruder + self.propertyChanged.emit() + def getBrushShape(self) -> int: return self._brush_shape @@ -152,15 +163,15 @@ class PaintTool(Tool): def getCanUndo(self) -> bool: return self._view.canUndo() + def getCanRedo(self) -> bool: + return self._view.canRedo() + def getState(self) -> int: return self._state def _onCanUndoChanged(self): self.propertyChanged.emit() - def getCanRedo(self) -> bool: - return self._view.canRedo() - def _onCanRedoChanged(self): self.propertyChanged.emit() @@ -176,7 +187,7 @@ class PaintTool(Tool): width, height = self._view.getUvTexDimensions() clear_image = QImage(width, height, QImage.Format.Format_RGB32) clear_image.fill(Qt.GlobalColor.white) - self._view.addStroke(clear_image, 0, 0, "none", False) + self._view.addStroke(clear_image, 0, 0, "none" if self.getPaintType() != "extruder" else "0", False) self._updateScene() @@ -217,61 +228,127 @@ class PaintTool(Tool): def _nodeTransformChanged(self, *args) -> None: self._cache_dirty = True - def _getTexCoordsFromClick(self, node: SceneNode, x: float, y: float) -> Tuple[int, Optional[numpy.ndarray]]: - face_id = self._faces_selection_pass.getFaceIdAtPosition(x, y) - if face_id < 0 or face_id >= node.getMeshData().getFaceCount(): - return face_id, None + @staticmethod + def _getBarycentricCoordinates(points: numpy.array, triangle: numpy.array) -> Optional[numpy.array]: + v0 = triangle[1] - triangle[0] + v1 = triangle[2] - triangle[0] + v2 = points - triangle[0] - pt = self._picking_pass.getPickedPosition(x, y).getData() + d00 = numpy.sum(v0 * v0, axis=0) + d01 = numpy.sum(v0 * v1, axis=0) + d11 = numpy.sum(v1 * v1, axis=0) + d20 = numpy.sum(v2 * v0, axis=1) + d21 = numpy.sum(v2 * v1, axis=1) - va, vb, vc = self._mesh_transformed_cache.getFaceNodes(face_id) + denominator = d00 * d11 - d01 ** 2 - face_uv_coordinates = node.getMeshData().getFaceUvCoords(face_id) - if face_uv_coordinates is None: - return face_id, None - ta, tb, tc = face_uv_coordinates + if denominator < 1e-6: # Degenerate triangle + return None - # 'Weight' of each vertex that would produce point pt, so we can generate the texture coordinates from the uv ones of the vertices. - # See (also) https://mathworld.wolfram.com/BarycentricCoordinates.html - wa = PaintTool._get_intersect_ratio_via_pt(va, pt, vb, vc) - wb = PaintTool._get_intersect_ratio_via_pt(vb, pt, vc, va) - wc = PaintTool._get_intersect_ratio_via_pt(vc, pt, va, vb) - wt = wa + wb + wc - if wt == 0: - return face_id, None - wa /= wt - wb /= wt - wc /= wt - texcoords = wa * ta + wb * tb + wc * tc - return face_id, texcoords + v = (d11 * d20 - d01 * d21) / denominator + w = (d00 * d21 - d01 * d20) / denominator + u = 1 - v - w - def _iteratateSplitSubstroke(self, node, substrokes, - info_a: Tuple[Tuple[float, float], Tuple[int, Optional[numpy.ndarray]]], - info_b: Tuple[Tuple[float, float], Tuple[int, Optional[numpy.ndarray]]]) -> None: - click_a, (face_a, texcoords_a) = info_a - click_b, (face_b, texcoords_b) = info_b + return numpy.column_stack((u, v, w)) - if (abs(click_a[0] - click_b[0]) < 0.0001 and abs(click_a[1] - click_b[1]) < 0.0001) or (face_a < 0 and face_b < 0): - return - if face_b < 0 or face_a == face_b: - substrokes.append((self._last_text_coords, texcoords_a)) - return - if face_a < 0: - substrokes.append((self._last_text_coords, texcoords_b)) - return + def _getStrokePolygon(self, stroke_a: numpy.ndarray, stroke_b: numpy.ndarray) -> Polygon: + shape = None + side = self._brush_size + match self._brush_shape: + case PaintTool.Brush.Shape.SQUARE: + shape = Polygon([(side, side), (-side, side), (-side, -side), (side, -side)]) + case PaintTool.Brush.Shape.CIRCLE: + shape = Polygon.approximatedCircle(side, 32) + case _: + Logger.error(f"Unknown brush shape '{self._brush_shape}'.") + if shape is None: + return Polygon() + return shape.translate(stroke_a[0], stroke_a[1]).unionConvexHulls(shape.translate(stroke_b[0], stroke_b[1])) - mouse_mid = (click_a[0] + click_b[0]) / 2.0, (click_a[1] + click_b[1]) / 2.0 - face_mid, texcoords_mid = self._getTexCoordsFromClick(node, mouse_mid[0], mouse_mid[1]) - mid_struct = (mouse_mid, (face_mid, texcoords_mid)) - if face_mid == face_a: - substrokes.append((texcoords_a, texcoords_mid)) - self._iteratateSplitSubstroke(node, substrokes, mid_struct, info_b) - elif face_mid == face_b: - substrokes.append((texcoords_mid, texcoords_b)) - self._iteratateSplitSubstroke(node, substrokes, info_a, mid_struct) - else: - self._iteratateSplitSubstroke(node, substrokes, mid_struct, info_b) - self._iteratateSplitSubstroke(node, substrokes, info_a, mid_struct) + @staticmethod + def _rasterizePolygons(polygons: List[Polygon], pen: QPen, brush: QBrush) -> Tuple[QImage, Tuple[int, int]]: + if not polygons: + return QImage(), (0, 0) + + bounding_box = polygons[0].getBoundingBox() + for polygon in polygons[1:]: + bounding_box += polygon.getBoundingBox() + + bounding_box = AxisAlignedBox2D(numpy.array([math.floor(bounding_box.left), math.floor(bounding_box.top)]), + numpy.array([math.ceil(bounding_box.right), math.ceil(bounding_box.bottom)])) + + # Use RGB32 which is more optimized for drawing to + image = QImage(int(bounding_box.width), int(bounding_box.height), QImage.Format.Format_RGB32) + image.fill(0) + + painter = QPainter(image) + painter.translate(-bounding_box.left, -bounding_box.bottom) + painter.setRenderHint(QPainter.RenderHint.Antialiasing, False) + painter.setPen(pen) + painter.setBrush(brush) + + for polygon in polygons: + painter.drawPolygon(QPolygonF([QPointF(point[0], point[1]) for point in polygon])) + + painter.end() + + return image, (int(bounding_box.left), int(bounding_box.bottom)) + + # NOTE: Currently, it's unclear how well this would work for non-convex brush-shapes. + def _getUvAreasForStroke(self, world_coords_a: numpy.ndarray, world_coords_b: numpy.ndarray) -> List[Polygon]: + """ Fetches all texture-coordinate areas within the provided stroke on the mesh. + + Calculates intersections of the stroke with the surface of the geometry and maps them to UV-space polygons. + + :param face_id_a: ID of the face where the stroke starts. + :param face_id_b: ID of the face where the stroke ends. + :param world_coords_a: 3D ('world') coordinates corresponding to the starting stroke point. + :param world_coords_b: 3D ('world') coordinates corresponding to the ending stroke point. + :return: A list of UV-mapped polygons representing areas intersected by the stroke on the node's mesh surface. + """ + + def get_projected_on_plane(pt: numpy.ndarray) -> numpy.ndarray: + return numpy.array([*self._camera.projectToViewport(Vector(*pt))], dtype=numpy.float32) + + def get_projected_on_viewport_image(pt: numpy) -> numpy.ndarray: + return numpy.array([pt[0] + self._camera.getViewportWidth() / 2.0, + self._camera.getViewportHeight() - (pt[1] + self._camera.getViewportHeight() / 2.0)], + dtype=numpy.float32) + + stroke_poly = self._getStrokePolygon(get_projected_on_plane(world_coords_a), get_projected_on_plane(world_coords_b)) + stroke_poly_viewport = Polygon([get_projected_on_viewport_image(point) for point in stroke_poly]) + + faces_image, (faces_x, faces_y) = PaintTool._rasterizePolygons([stroke_poly_viewport], + QPen(Qt.PenStyle.NoPen), + QBrush(Qt.GlobalColor.white)) + faces = self._faces_selection_pass.getFacesIdsUnderMask(faces_image, faces_x, faces_y) + + texture_dimensions = numpy.array(list(self._view.getUvTexDimensions())) + + res = [] + for face in faces: + _, fnorm = self._mesh_transformed_cache.getFacePlane(face) + if numpy.dot(fnorm, self._cam_norm) < 0: # <- facing away from the viewer + continue + + va, vb, vc = self._mesh_transformed_cache.getFaceNodes(face) + stroke_tri = Polygon([ + get_projected_on_plane(va), + get_projected_on_plane(vb), + get_projected_on_plane(vc)]) + face_uv_coordinates = self._node_cache.getMeshData().getFaceUvCoords(face) + if face_uv_coordinates is None: + continue + ta, tb, tc = face_uv_coordinates + original_uv_poly = numpy.array([ta, tb, tc]) + uv_area = stroke_poly.intersection(stroke_tri) + + if uv_area.isValid(): + uv_area_barycentric = PaintTool._getBarycentricCoordinates(uv_area.getPoints(), stroke_tri.getPoints()) + if uv_area_barycentric is not None: + res.append(Polygon((uv_area_barycentric @ original_uv_poly) * texture_dimensions)) + + return res def event(self, event: Event) -> bool: """Handle mouse and keyboard events. @@ -282,7 +359,6 @@ class PaintTool(Tool): """ super().event(event) - controller = Application.getInstance().getController() node = Selection.getSelectedObject(0) if node is None: return False @@ -301,18 +377,19 @@ class PaintTool(Tool): if MouseEvent.LeftButton not in cast(MouseEvent, event).buttons: return False self._mouse_held = False - self._last_text_coords = None - self._last_mouse_coords = None - self._last_face_id = None + self._last_world_coords = None return True is_moved = event.type == Event.MouseMoveEvent is_pressed = event.type == Event.MousePressEvent if (is_moved or is_pressed) and self._controller.getToolsEnabled(): - if is_moved and not self._mouse_held: - return False - mouse_evt = cast(MouseEvent, event) + + if not self._picking_pass: + self._picking_pass = CuraApplication.getInstance().getRenderer().getRenderPass("picking_selected") + if not self._picking_pass: + return False + if is_pressed: if MouseEvent.LeftButton not in mouse_evt.buttons: return False @@ -324,13 +401,9 @@ class PaintTool(Tool): if not self._faces_selection_pass: return False - if not self._picking_pass: - self._picking_pass = CuraApplication.getInstance().getRenderer().getRenderPass("picking_selected") - if not self._picking_pass: - return False - - camera = self._controller.getScene().getActiveCamera() - if not camera: + if self._camera is None: + self._updateCamera() + if self._camera is None: return False if node != self._node_cache: @@ -345,35 +418,37 @@ class PaintTool(Tool): if not self._mesh_transformed_cache: return False - face_id, texcoords = self._getTexCoordsFromClick(node, mouse_evt.x, mouse_evt.y) - if texcoords is None: + face_id = self._faces_selection_pass.getFaceIdAtPosition(mouse_evt.x, mouse_evt.y) + if face_id < 0 or face_id >= self._mesh_transformed_cache.getFaceCount(): + if self._view.clearCursorStroke(): + self._updateScene(node) + return True return False - if self._last_text_coords is None: - self._last_text_coords = texcoords - self._last_mouse_coords = (mouse_evt.x, mouse_evt.y) - self._last_face_id = face_id - substrokes = [] - if face_id == self._last_face_id: - substrokes.append((self._last_text_coords, texcoords)) - else: - self._iteratateSplitSubstroke(node, substrokes, - (self._last_mouse_coords, (self._last_face_id, self._last_text_coords)), - ((mouse_evt.x, mouse_evt.y), (face_id, texcoords))) + world_coords_vec = self._picking_pass.getPickedPosition(mouse_evt.x, mouse_evt.y) + world_coords = world_coords_vec.getData() + if self._last_world_coords is None: + self._last_world_coords = world_coords - w, h = self._view.getUvTexDimensions() - for start_coords, end_coords in substrokes: - sub_image, (start_x, start_y) = self._createStrokeImage( - start_coords[0] * w, - start_coords[1] * h, - end_coords[0] * w, - end_coords[1] * h - ) - self._view.addStroke(sub_image, start_x, start_y, self._brush_color, is_moved) + try: + brush_color = self._brush_color if self.getPaintType() != "extruder" else str(self._brush_extruder) + uv_areas_cursor = self._getUvAreasForStroke(world_coords, world_coords) + if len(uv_areas_cursor) > 0: + cursor_stroke_img, (start_x, start_y) = self._createStrokeImage(uv_areas_cursor) + self._view.setCursorStroke(cursor_stroke_img, start_x, start_y, brush_color) + else: + self._view.clearCursorStroke() - self._last_text_coords = texcoords - self._last_mouse_coords = (mouse_evt.x, mouse_evt.y) - self._last_face_id = face_id + if self._mouse_held: + uv_areas = self._getUvAreasForStroke(self._last_world_coords, world_coords) + if len(uv_areas) == 0: + return False + stroke_img, (start_x, start_y) = self._createStrokeImage(uv_areas) + self._view.addStroke(stroke_img, start_x, start_y, brush_color, is_moved) + except: + Logger.logException("e", "Error when adding paint stroke") + + self._last_world_coords = world_coords self._updateScene(node) return True @@ -421,4 +496,4 @@ class PaintTool(Tool): def _updateIgnoreUnselectedObjects(self): ignore_unselected_objects = self._controller.getActiveView().name == "PaintTool" CuraApplication.getInstance().getRenderer().getRenderPass("selection").setIgnoreUnselectedObjects(ignore_unselected_objects) - CuraApplication.getInstance().getRenderer().getRenderPass("selection_faces").setIgnoreUnselectedObjects(ignore_unselected_objects) \ No newline at end of file + CuraApplication.getInstance().getRenderer().getRenderPass("selection_faces").setIgnoreUnselectedObjects(ignore_unselected_objects) diff --git a/plugins/PaintTool/PaintTool.qml b/plugins/PaintTool/PaintTool.qml index 548b6b047e..8548c3c14e 100644 --- a/plugins/PaintTool/PaintTool.qml +++ b/plugins/PaintTool/PaintTool.qml @@ -11,6 +11,7 @@ import Cura 1.0 as Cura Item { id: base + width: childrenRect.width height: childrenRect.height UM.I18nCatalog { id: catalog; name: "cura"} @@ -57,6 +58,14 @@ Item mode: "support" visible: false } + + PaintModeButton + { + text: catalog.i18nc("@action:button", "Material") + icon: "Extruder" + tooltipText: catalog.i18nc("@tooltip", "Paint on model to select the material to be used") + mode: "extruder" + } } //Line between the sections. @@ -70,6 +79,7 @@ Item RowLayout { id: rowBrushColor + visible: !rowExtruder.visible UM.Label { @@ -116,6 +126,30 @@ Item } } + RowLayout + { + id: rowExtruder + visible: UM.Controller.properties.getValue("PaintType") === "extruder" + + UM.Label + { + text: catalog.i18nc("@label", "Mark as") + } + + Repeater + { + id: repeaterExtruders + model: CuraApplication.getExtrudersModel() + delegate: Cura.ExtruderButton + { + extruder: model + + checked: UM.Controller.properties.getValue("BrushExtruder") === model.index + onClicked: UM.Controller.setProperty("BrushExtruder", model.index) + } + } + } + RowLayout { id: rowBrushShape @@ -163,8 +197,8 @@ Item width: parent.width indicatorVisible: false - from: 10 - to: 1000 + from: 1 + to: 100 value: UM.Controller.properties.getValue("BrushSize") onPressedChanged: function(pressed) diff --git a/plugins/PaintTool/PaintView.py b/plugins/PaintTool/PaintView.py index b3bc9867c3..0fa9cecba4 100644 --- a/plugins/PaintTool/PaintView.py +++ b/plugins/PaintTool/PaintView.py @@ -2,14 +2,15 @@ # Cura is released under the terms of the LGPLv3 or higher. import os -from PyQt6.QtCore import QRect, pyqtSignal -from typing import Optional, Dict -from PyQt6.QtGui import QImage, QUndoStack +from PyQt6.QtCore import QRect, pyqtSignal +from PyQt6.QtGui import QImage, QUndoStack, QPainter, QColor +from typing import Optional, List, Tuple, Dict from cura.CuraApplication import CuraApplication from cura.BuildVolume import BuildVolume from cura.CuraView import CuraView +from cura.Machines.Models.ExtrudersModel import ExtrudersModel from UM.PluginRegistry import PluginRegistry from UM.View.GL.ShaderProgram import ShaderProgram from UM.View.GL.Texture import Texture @@ -36,6 +37,8 @@ class PaintView(CuraView): super().__init__(use_empty_menu_placeholder = True) self._paint_shader: Optional[ShaderProgram] = None self._current_paint_texture: Optional[Texture] = None + self._previous_paint_texture_stroke: Optional[QRect] = None + self._cursor_texture: Optional[Texture] = None self._current_bits_ranges: tuple[int, int] = (0, 0) self._current_paint_type = "" self._paint_modes: Dict[str, Dict[str, "PaintView.PaintType"]] = {} @@ -49,6 +52,8 @@ class PaintView(CuraView): application.engineCreatedSignal.connect(self._makePaintModes) self._scene = application.getController().getScene() + self._extruders_model: Optional[ExtrudersModel] = None + canUndoChanged = pyqtSignal(bool) canRedoChanged = pyqtSignal(bool) @@ -59,22 +64,98 @@ class PaintView(CuraView): return self._paint_undo_stack.canRedo() def _makePaintModes(self): - theme = CuraApplication.getInstance().getTheme() + application = CuraApplication.getInstance() + + self._extruders_model = application.getExtrudersModel() + self._extruders_model.modelChanged.connect(self._onExtrudersChanged) + + theme = application.getTheme() usual_types = {"none": self.PaintType(Color(*theme.getColor("paint_normal_area").getRgb()), 0), "preferred": self.PaintType(Color(*theme.getColor("paint_preferred_area").getRgb()), 1), "avoid": self.PaintType(Color(*theme.getColor("paint_avoid_area").getRgb()), 2)} self._paint_modes = { "seam": usual_types, "support": usual_types, + "extruder": self._makeExtrudersColors(), } self._current_paint_type = "seam" + def _makeExtrudersColors(self) -> Dict[str, "PaintView.PaintType"]: + extruders_colors: Dict[str, "PaintView.PaintType"] = {} + + for extruder_item in self._extruders_model.items: + if "color" in extruder_item: + material_color = extruder_item["color"] + else: + material_color = self._extruders_model.defaultColors[0] + + index = extruder_item["index"] + extruders_colors[str(index)] = self.PaintType(Color(*QColor(material_color).getRgb()), index) + + return extruders_colors + + def _onExtrudersChanged(self) -> None: + if self._paint_modes is None: + return + + self._paint_modes["extruder"] = self._makeExtrudersColors() + + controller = CuraApplication.getInstance().getController() + if controller.getActiveView() != self: + return + + selected_objects = Selection.getAllSelectedObjects() + if len(selected_objects) != 1: + return + + controller.getScene().sceneChanged.emit(selected_objects[0]) + def _checkSetup(self): if not self._paint_shader: shader_filename = os.path.join(PluginRegistry.getInstance().getPluginPath("PaintTool"), "paint.shader") self._paint_shader = OpenGL.getInstance().createShaderProgram(shader_filename) + def setCursorStroke(self, stroke_mask: QImage, start_x: int, start_y: int, brush_color: str): + if self._cursor_texture is None or self._cursor_texture.getImage() is None: + return + + self.clearCursorStroke() + + stroke_image = stroke_mask.copy() + alpha_mask = stroke_image.convertedTo(QImage.Format.Format_Mono) + stroke_image.setAlphaChannel(alpha_mask) + + painter = QPainter(stroke_image) + + painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceAtop) + display_color = self._paint_modes[self._current_paint_type][brush_color].display_color + paint_color = QColor(*[int(color_part * 255) for color_part in [display_color.r, display_color.g, display_color.b]]) + paint_color.setAlpha(255) + painter.fillRect(0, 0, stroke_mask.width(), stroke_mask.height(), paint_color) + + painter.end() + + self._cursor_texture.setSubImage(stroke_image, start_x, start_y) + + self._previous_paint_texture_stroke = QRect(start_x, start_y, stroke_mask.width(), stroke_mask.height()) + + def clearCursorStroke(self) -> bool: + if (self._previous_paint_texture_stroke is None or + self._cursor_texture is None or self._cursor_texture.getImage() is None): + return False + + clear_image = QImage(self._previous_paint_texture_stroke.width(), + self._previous_paint_texture_stroke.height(), + QImage.Format.Format_ARGB32) + clear_image.fill(0) + self._cursor_texture.setSubImage(clear_image, + self._previous_paint_texture_stroke.x(), + self._previous_paint_texture_stroke.y()) + self._previous_paint_texture_stroke = None + + return True + def addStroke(self, stroke_mask: QImage, start_x: int, start_y: int, brush_color: str, merge_with_previous: bool) -> None: if self._current_paint_texture is None or self._current_paint_texture.getImage() is None: return @@ -111,7 +192,7 @@ class PaintView(CuraView): def redoStroke(self) -> None: self._paint_undo_stack.redo() - def getUvTexDimensions(self): + def getUvTexDimensions(self) -> Tuple[int, int]: if self._current_paint_texture is not None: return self._current_paint_texture.getWidth(), self._current_paint_texture.getHeight() return 0, 0 @@ -121,6 +202,7 @@ class PaintView(CuraView): def setPaintType(self, paint_type: str) -> None: self._current_paint_type = paint_type + self._prepareDataMapping() def _prepareDataMapping(self): node = Selection.getAllSelectedObjects()[0] @@ -162,8 +244,17 @@ class PaintView(CuraView): for node in Selection.getAllSelectedObjects(): paint_batch.addItem(node.getWorldTransformation(copy=False), node.getMeshData(), normal_transformation=node.getCachedNormalMatrix()) - self._current_paint_texture = node.callDecoration("getPaintTexture") - self._paint_shader.setTexture(0, self._current_paint_texture) + paint_texture = node.callDecoration("getPaintTexture") + if paint_texture != self._current_paint_texture: + self._current_paint_texture = paint_texture + self._paint_shader.setTexture(0, self._current_paint_texture) + + self._cursor_texture = OpenGL.getInstance().createTexture(paint_texture.getWidth(), paint_texture.getHeight()) + image = QImage(paint_texture.getWidth(), paint_texture.getHeight(), QImage.Format.Format_ARGB32) + image.fill(0) + self._cursor_texture.setImage(image) + self._paint_shader.setTexture(1, self._cursor_texture) + self._previous_paint_texture_stroke = None self._paint_shader.setUniformValue("u_bitsRangesStart", self._current_bits_ranges[0]) self._paint_shader.setUniformValue("u_bitsRangesEnd", self._current_bits_ranges[1]) diff --git a/plugins/PaintTool/paint.shader b/plugins/PaintTool/paint.shader index 1982724910..c1608a2cdf 100644 --- a/plugins/PaintTool/paint.shader +++ b/plugins/PaintTool/paint.shader @@ -30,6 +30,7 @@ fragment = uniform highp vec3 u_lightPosition; uniform highp vec3 u_viewPosition; uniform sampler2D u_texture; + uniform sampler2D u_texture_cursor; uniform mediump int u_bitsRangesStart; uniform mediump int u_bitsRangesEnd; uniform mediump vec3 u_renderColors[16]; @@ -42,24 +43,33 @@ fragment = { mediump vec4 final_color = vec4(0.0); - /* Ambient Component */ - final_color += u_ambientColor; - highp vec3 normal = normalize(v_normal); highp vec3 light_dir = normalize(u_lightPosition - v_vertex); - /* Diffuse Component */ - ivec4 texture = ivec4(texture(u_texture, v_uvs) * 255.0); - uint color_index = (texture.r << 16) | (texture.g << 8) | texture.b; - color_index = (color_index << (32 - 1 - u_bitsRangesEnd)) >> 32 - 1 - (u_bitsRangesEnd - u_bitsRangesStart); + vec4 cursor_color = texture(u_texture_cursor, v_uvs); + if (cursor_color.a > 0.5) + { + /* Cursor */ + final_color.rgb = cursor_color.rgb; + highp float n_dot_l = mix(0.7, 1.0, dot(normal, light_dir)); + final_color = (n_dot_l * final_color); + } + else + { + final_color += u_ambientColor; - vec4 diffuse_color = vec4(u_renderColors[color_index] / 255.0, 1.0); - highp float n_dot_l = mix(0.3, 0.7, dot(normal, light_dir)); - final_color += (n_dot_l * diffuse_color); + ivec4 texture_color = ivec4(texture(u_texture, v_uvs) * 255.0); + uint color_index = (texture_color.r << 16) | (texture_color.g << 8) | texture_color.b; + color_index = (color_index << (32 - 1 - u_bitsRangesEnd)) >> 32 - 1 - (u_bitsRangesEnd - u_bitsRangesStart); + vec4 diffuse_color = vec4(u_renderColors[color_index] / 255.0, 1.0); + highp float n_dot_l = mix(0.3, 0.7, dot(normal, light_dir)); + final_color += (n_dot_l * diffuse_color); + } + + /* Output */ final_color.a = 1.0; - - frag_color = final_color; + gl_FragColor = final_color; } vertex41core = @@ -95,6 +105,7 @@ fragment41core = uniform highp vec3 u_lightPosition; uniform highp vec3 u_viewPosition; uniform sampler2D u_texture; + uniform sampler2D u_texture_cursor; uniform mediump int u_bitsRangesStart; uniform mediump int u_bitsRangesEnd; uniform mediump vec3 u_renderColors[16]; @@ -108,29 +119,39 @@ fragment41core = { mediump vec4 final_color = vec4(0.0); - /* Ambient Component */ - final_color += u_ambientColor; - highp vec3 normal = normalize(v_normal); highp vec3 light_dir = normalize(u_lightPosition - v_vertex); - /* Diffuse Component */ - ivec4 texture = ivec4(texture(u_texture, v_uvs) * 255.0); - uint color_index = (texture.r << 16) | (texture.g << 8) | texture.b; - color_index = (color_index << (32 - 1 - u_bitsRangesEnd)) >> 32 - 1 - (u_bitsRangesEnd - u_bitsRangesStart); + vec4 cursor_color = texture(u_texture_cursor, v_uvs); + if (cursor_color.a > 0.5) + { + /* Cursor */ + final_color.rgb = cursor_color.rgb; + highp float n_dot_l = mix(0.7, 1.0, dot(normal, light_dir)); + final_color = (n_dot_l * final_color); + } + else + { + final_color += u_ambientColor; - vec4 diffuse_color = vec4(u_renderColors[color_index] / 255.0, 1.0); - highp float n_dot_l = mix(0.3, 0.7, dot(normal, light_dir)); - final_color += (n_dot_l * diffuse_color); + ivec4 texture_color = ivec4(texture(u_texture, v_uvs) * 255.0); + uint color_index = (texture_color.r << 16) | (texture_color.g << 8) | texture_color.b; + color_index = (color_index << (32 - 1 - u_bitsRangesEnd)) >> 32 - 1 - (u_bitsRangesEnd - u_bitsRangesStart); + vec4 diffuse_color = vec4(u_renderColors[color_index] / 255.0, 1.0); + highp float n_dot_l = mix(0.3, 0.7, dot(normal, light_dir)); + final_color += (n_dot_l * diffuse_color); + } + + /* Output */ final_color.a = 1.0; - frag_color = final_color; } [defaults] u_ambientColor = [0.3, 0.3, 0.3, 1.0] u_texture = 0 +u_texture_cursor = 1 [bindings] u_modelMatrix = model_matrix diff --git a/plugins/PostProcessingPlugin/scripts/AnnealingOrDrying.py b/plugins/PostProcessingPlugin/scripts/AnnealingOrDrying.py new file mode 100644 index 0000000000..1841a8b62b --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/AnnealingOrDrying.py @@ -0,0 +1,571 @@ +""" +Copyright (c) 2025 GregValiant (Greg Foresi) + + When Annealing: + The user may elect to hold the build plate at a temperature for a period of time. When the hold expires, the 'Timed Cooldown' will begin. + If there is no 'Hold Time' then the 'Annealing' cooldown will begin when the print ends. In 'Annealing' the bed temperature drops in 3° increments across the time span. + G4 commands are used for the cooldown steps. + If there is a 'Heated Chamber' then the chamber will start to cool when the bed temperature reaches the chamber temperature. + + When drying filament: + The bed must be empty because the printer will auto-home before raising the Z to 'machine_height minus 20mm' and then park the head in the XY. + The bed will heat up to the set point. + G4 commands are used to keep the machine from turning the bed off until the Drying Time has expired. + If you happen to have an enclosure with a fan, the fan can be set up to run during the drying or annealing. + + NOTE: This script uses the G4 Dwell command as a timer. It cannot be canceled from the LCD. If you wish to 'escape' from G4 you might have to cancel the print from the LCD or cycle the printer on and off to reset. +""" + +from UM.Application import Application +from ..Script import Script +from UM.Message import Message + +class AnnealingOrDrying(Script): + + def initialize(self) -> None: + super().initialize() + # Get the Bed Temperature from Cura + self.global_stack = Application.getInstance().getGlobalContainerStack() + bed_temp_during_print = str(self.global_stack.getProperty("material_bed_temperature", "value")) + self._instance.setProperty("startout_temp", "value", bed_temp_during_print) + # Get the Build Volume temperature if there is one + heated_build_volume = bool(self.global_stack.getProperty("machine_heated_build_volume", "value")) + chamber_fan_nr = self.global_stack.getProperty("build_volume_fan_nr", "value") + extruder_count = self.global_stack.getProperty("machine_extruder_count", "value") + if heated_build_volume: + chamber_temp = self.global_stack.getProperty("build_volume_temperature", "value") + self._instance.setProperty("has_build_volume_heater", "value", heated_build_volume) + self._instance.setProperty("build_volume_temp", "value", chamber_temp) + try: + if chamber_fan_nr > 0: + self._instance.setProperty("enable_chamber_fan_setting", "value", True) + except: + pass + + def getSettingDataString(self): + return """{ + "name": "Annealing CoolDown or Filament Drying", + "key": "AnnealingOrDrying", + "metadata": {}, + "version": 2, + "settings": + { + "enable_script": + { + "label": "Enable the Script", + "description": "If it isn't enabled it doesn't run.", + "type": "bool", + "default_value": true, + "enabled": true + }, + "cycle_type": + { + "label": "Anneal Print or Dry Filament", + "description": "Whether to Anneal the Print (by keeping the bed hot for a period of time), or to use the bed as a Filament Dryer. If drying; you will still need to slice a model, but it will not print. The gcode will consist only of a short script to heat the bed, wait for a while, then turn the bed off. The 'Z' will move to the max height and XY park position so the filament can be covered. The 'Hold Time', 'Bed Start Temp' and (if applicable) the 'Chamber Temp' come from these settings rather than from the Cura settings. When annealing; the Timed Cooldown will commence when the print ends.", + "type": "enum", + "options": + { + "anneal_cycle": "Anneal Print", + "dry_cycle": "Dry Filament" + }, + "default_value": "anneal_cycle", + "enabled": true, + "enabled": "enable_script" + }, + "heating_zone_selection": + { + "label": "Hold the Temp for the:", + "description": "Select the 'Bed' for just the bed, or 'Bed and Chamber' if you want to include your 'Heated Build Volume'.", + "type": "enum", + "options": + { + "bed_only": "Bed", + "bed_chamber": "Bed and Chamber" + }, + "default_value": "bed_only", + "enabled": "enable_script" + }, + "wait_time": + { + "label": "Hold Time at Temp(s)", + "description": "Hold the bed temp at the 'Bed Start Out Temperature' for this amount of time (in decimal hours). When this time expires then the Annealing cool down will start. This is also the 'Drying Time' used when 'Drying Filament'.", + "type": "float", + "default_value": 0.0, + "unit": "Decimal Hrs ", + "enabled": "enable_script and cycle_type == 'anneal_cycle'" + }, + "dry_time": + { + "label": "Drying Time", + "description": "Hold the bed temp at the 'Bed Start Out Temperature' for this amount of time (in decimal hours). When this time expires the bed will shut off.", + "type": "float", + "default_value": 4.0, + "unit": "Decimal Hrs ", + "enabled": "enable_script and cycle_type == 'dry_cycle'" + }, + "pause_cmd": + { + "label": "Pause Cmd for Auto-Home", + "description": "Not required when you are paying attention and the bed is empty; ELSE; Enter the pause command to use prior to the Auto-Home command. The pause insures that the user IS paying attention and clears the build plate for Auto-Home. If you leave the box empty then there won't be a pause.", + "type": "str", + "default_value": "", + "enabled": "enable_script and cycle_type == 'dry_cycle'" + }, + "startout_temp": + { + "label": "Bed Start Out Temperature:", + "description": "Enter the temperature to start at. This is typically the bed temperature during the print but can be changed here. This is also the temperature used when drying filament.", + "type": "int", + "value": 30, + "unit": "Degrees ", + "minimum_value": 30, + "maximum_value": 110, + "maximum_value_warning": 100, + "enabled": "enable_script" + }, + "lowest_temp": + { + "label": "Shut-Off Temp:", + "description": "Enter the lowest temperature to control the cool down. This is the shut-off temperature for the build plate and (when applicable) the Heated Chamber. The minimum value is 30", + "type": "int", + "default_value": 30, + "unit": "Degrees ", + "minimum_value": 30, + "enabled": "enable_script and cycle_type == 'anneal_cycle'" + }, + "build_volume_temp": + { + "label": "Build Volume Temperature:", + "description": "Enter the temperature for the Build Volume (Heated Chamber). This is typically the temperature during the print but can be changed here.", + "type": "int", + "value": 24, + "unit": "Degrees ", + "minimum_value": 0, + "maximum_value": 90, + "maximum_value_warning": 75, + "enabled": "enable_script and has_build_volume_heater and heating_zone_selection == 'bed_chamber'" + }, + "enable_chamber_fan_setting": + { + "label": "Hidden Setting", + "description": "Enables chamber fan and speed.", + "type": "bool", + "default_value": false, + "enabled": false + }, + "chamber_fan_speed": + { + "label": "Chamber Fan Speed", + "description": "Set to % fan speed. Set to 0 to turn it off.", + "type": "int", + "default_value": 0, + "minimum_value": 0, + "maximum_value": 100, + "unit": "% ", + "enabled": "enable_script and enable_chamber_fan_setting" + }, + "time_span": + { + "label": "Cool Down Time Span:", + "description": "The total amount of time (in decimal hours) to control the cool down. The build plate temperature will be dropped in 3° increments across this time span. 'Cool Down Time' starts at the end of the 'Hold Time' if you entered one.", + "type": "float", + "default_value": 1.0, + "unit": "Decimal Hrs ", + "minimum_value_warning": 0.25, + "enabled": "enable_script and cycle_type == 'anneal_cycle'" + }, + "park_head": + { + "label": "Park at MaxX and MaxY", + "description": "When unchecked, the park position is X0 Y0. Enable this setting to move the nozzle to the Max X and Max Y to allow access to the print.", + "type": "bool", + "default_value": false, + "enabled": "enable_script and cycle_type == 'anneal_cycle'" + }, + "park_max_z": + { + "label": "Move to MaxZ", + "description": "Enable this setting to move the nozzle to 'Machine_Height - 20' to allow the print to be covered.", + "type": "bool", + "default_value": false, + "enabled": "enable_script and cycle_type == 'anneal_cycle'" + }, + "beep_when_done": + { + "label": "Beep when done", + "description": "Add an annoying noise when the Cool Down completes.", + "type": "bool", + "default_value": true, + "enabled": "enable_script" + }, + "beep_duration": + { + "label": "Beep Duration", + "description": "The length of the buzzer sound. Units are in milliseconds so 1000ms = 1 second.", + "type": "int", + "unit": "milliseconds ", + "default_value": 1000, + "enabled": "beep_when_done and enable_script" + }, + "add_messages": + { + "label": "Include M117 and M118 messages", + "description": "Add messages to the LCD and any print server.", + "type": "bool", + "default_value": false, + "enabled": "enable_script" + }, + "has_build_volume_heater": + { + "label": "Hidden setting", + "description": "Hidden. This setting enables the build volume settings.", + "type": "bool", + "default_value": false, + "enabled": false + } + } + }""" + + def execute(self, data): + # Exit if there is no heated bed. + if not bool(self.global_stack.getProperty("machine_heated_bed", "value")): + Message(title = "[Anneal or Dry Filament]", text = "The script did not run because Heated Bed is disabled in Machine Settings.").show() + return data + # Enter a message in the gcode if the script is not enabled. + if not bool(self.getSettingValueByKey("enable_script")): + data[0] += "; [Anneal or Dry Filament] was not enabled\n" + return data + lowest_temp = int(self.getSettingValueByKey("lowest_temp")) + + # If the shutoff temp is under 30° then exit as a safety precaution so the bed doesn't stay on. + if lowest_temp < 30: + data[0] += "; Anneal or Dry Filament did not run. Shutoff Temp < 30\n" + Message(title = "[Anneal or Dry Filament]", text = "The script did not run because the Shutoff Temp is less than 30°.").show() + return data + extruders = self.global_stack.extruderList + bed_temperature = int(self.getSettingValueByKey("startout_temp")) + heated_chamber = bool(self.global_stack.getProperty("machine_heated_build_volume", "value")) + heating_zone = self.getSettingValueByKey("heating_zone_selection") + + # Get the heated chamber temperature or set to 0 if no chamber + if heated_chamber: + chamber_temp = str(self.getSettingValueByKey("build_volume_temp")) + else: + heating_zone = "bed_only" + chamber_temp = "0" + + # Beep line + if bool(self.getSettingValueByKey("beep_when_done")): + beep_duration = self.getSettingValueByKey("beep_duration") + self.beep_string = f"M300 S440 P{beep_duration} ; Beep\n" + else: + self.beep_string = "" + + # For compatibility with earlier Cura versions + if self.global_stack.getProperty("build_volume_fan_nr", "value") is not None: + has_bv_fan = bool(self.global_stack.getProperty("build_volume_fan_nr", "value")) + bv_fan_nr = int(self.global_stack.getProperty("build_volume_fan_nr", "value")) + if bv_fan_nr > 0: + speed_bv_fan = int(self.getSettingValueByKey("chamber_fan_speed")) + else: + speed_bv_fan = 0 + + if bool(extruders[0].getProperty("machine_scale_fan_speed_zero_to_one", "value")) and has_bv_fan: + speed_bv_fan = round(speed_bv_fan * 0.01) + else: + speed_bv_fan = round(speed_bv_fan * 2.55) + + if has_bv_fan and speed_bv_fan > 0: + self.bv_fan_on_str = f"M106 S{speed_bv_fan} P{bv_fan_nr} ; Build Chamber Fan On\n" + self.bv_fan_off_str = f"M106 S0 P{bv_fan_nr} ; Build Chamber Fan Off\n" + else: + self.bv_fan_on_str = "" + self.bv_fan_off_str = "" + else: + has_bv_fan = False + bv_fan_nr = 0 + speed_bv_fan = 0 + self.bv_fan_on_str = "" + self.bv_fan_off_str = "" + + # Park Head + max_y = str(self.global_stack.getProperty("machine_depth", "value")) + max_x = str(self.global_stack.getProperty("machine_width", "value")) + + # Max_z is limited to 'machine_height - 20' just so the print head doesn't smack into anything. + max_z = str(int(self.global_stack.getProperty("machine_height", "value")) - 20) + speed_travel = str(round(extruders[0].getProperty("speed_travel", "value")*60)) + park_xy = bool(self.getSettingValueByKey("park_head")) + park_z = bool(self.getSettingValueByKey("park_max_z")) + cycle_type = self.getSettingValueByKey("cycle_type") + add_messages = bool(self.getSettingValueByKey("add_messages")) + + if cycle_type == "anneal_cycle": + data = self._anneal_print(add_messages, data, bed_temperature, chamber_temp, heated_chamber, heating_zone, lowest_temp, max_x, max_y, max_z, park_xy, park_z, speed_travel) + elif cycle_type == "dry_cycle": + data = self._dry_filament_only(data, bed_temperature, chamber_temp, heated_chamber, heating_zone, max_y, max_z, speed_travel) + + return data + + def _anneal_print( + self, + add_messages: bool, + anneal_data: str, + bed_temperature: int, + chamber_temp: str, + heated_chamber: bool, + heating_zone: str, + lowest_temp: int, + max_x: str, + max_y: str, + max_z: str, + park_xy: bool, + park_z: bool, + speed_travel: str) -> str: + """ + The procedure disables the M140 (and M141) lines at the end of the print, and adds additional bed (and chamber) temperature commands to the end of the G-Code file. + The bed is allowed to cool down over a period of time. + + :param add_messages: Whether to include M117 and M118 messages for LCD and print server + :param anneal_data: The G-code data to be modified with annealing commands + :param bed_temperature: Starting bed temperature in degrees Celsius + :param chamber_temp: Chamber/build volume temperature in degrees Celsius as string + :param heated_chamber: Whether the printer has a heated build volume/chamber + :param heating_zone: Zone selection - "bed_only" or "bed_chamber" + :param lowest_temp: Final shutdown temperature in degrees Celsius + :param max_x: Maximum X axis position for parking as string + :param max_y: Maximum Y axis position for parking as string + :param max_z: Maximum Z axis position (machine height - 20mm) as string + :param park_xy: Whether to park the print head at max X and Y positions + :param park_z: Whether to raise Z to maximum safe height + :param speed_travel: Travel speed for positioning moves in mm/min as string + :return: Modified G-code data with annealing cooldown sequence + """ + # Put the head parking string together + bed_temp_during_print = int(self.global_stack.getProperty("material_bed_temperature", "value")) + time_minutes = 1 + time_span = int(float(self.getSettingValueByKey("time_span")) * 3600) + park_string = "" + if park_xy: + park_string += f"G0 F{speed_travel} X{max_x} Y{max_y} ; Park XY\n" + if park_z: + park_string += f"G0 Z{max_z} ; Raise Z to 'ZMax - 20'\n" + if not park_xy and not park_z: + park_string += f"G91 ; Relative movement\nG0 F{speed_travel} Z5 ; Raise Z\nG90 ; Absolute movement\nG0 X0 Y0 ; Park\n" + park_string += "M84 X Y E ; Disable steppers except Z\n" + + # Calculate the temperature differential + hysteresis = bed_temperature - lowest_temp + + # Exit if the bed temp is below the shutoff temp + if hysteresis <= 0: + anneal_data[0] += "; Anneal or Dry Filament did not run. Bed Temp < Shutoff Temp\n" + Message(title = "Anneal or Dry Filament", text = "Did not run because the Bed Temp < Shutoff Temp.").show() + return anneal_data + + # Drop the bed temperature in 3° increments. + num_steps = int(hysteresis / 3) + step_index = 2 + deg_per_step = int(hysteresis / num_steps) + time_per_step = int(time_span / num_steps) + step_down = bed_temperature + wait_time = int(float(self.getSettingValueByKey("wait_time")) * 3600) + + # Put the first lines of the anneal string together + anneal_string = ";\n;TYPE:CUSTOM ---------------- Anneal Print\n" + if bed_temperature == bed_temp_during_print: + anneal_string += self.beep_string + if add_messages: + anneal_string += "M117 Cool Down for " + str(round((wait_time + time_span)/3600,2)) + "hr\n" + anneal_string += "M118 Cool Down for " + str(round((wait_time + time_span)/3600,2)) + "hr\n" + anneal_string += self.bv_fan_on_str + if wait_time > 0: + # Add the parking string BEFORE the M190 + anneal_string += park_string + if heating_zone == "bed_only": + anneal_string += f"M190 S{bed_temperature} ; Set the bed temp\n{self.beep_string}" + if heating_zone == "bed_chamber": + anneal_string += f"M190 S{bed_temperature} ; Set the bed temp\nM141 S{chamber_temp} ; Set the chamber temp\n{self.beep_string}" + anneal_string += f"G4 S{wait_time} ; Hold for {round(wait_time / 3600,2)} hrs\n" + else: + # Add the parking string AFTER the M140 + anneal_string += f"M140 S{step_down} ; Set bed temp\n" + anneal_string += park_string + anneal_string += f"G4 S{time_per_step} ; wait time in seconds\n" + + step_down -= deg_per_step + time_remaining = round(time_span/3600,2) + + # Step the bed/chamber temps down and add each step to the anneal string. The chamber remains at it's temperature until the bed gets down to that temperature. + for num in range(bed_temperature, lowest_temp, -3): + anneal_string += f"M140 S{step_down} ; Step down bed\n" + if heating_zone == "bed_chamber" and int(step_down) < int(chamber_temp): + anneal_string += f"M141 S{step_down} ; Step down chamber\n" + anneal_string += f"G4 S{time_per_step} ; Wait\n" + if time_remaining >= 1.00: + if add_messages: + anneal_string += f"M117 CoolDown - {round(time_remaining,1)}hr\n" + anneal_string += f"M118 CoolDown - {round(time_remaining,1)}hr\n" + elif time_minutes > 0: + time_minutes = round(time_remaining * 60,1) + if add_messages: + anneal_string += f"M117 CoolDown - {time_minutes}min\n" + anneal_string += f"M118 CoolDown - {time_minutes}min\n" + time_remaining = round((time_span-(step_index*time_per_step))/3600,2) + step_down -= deg_per_step + step_index += 1 + if step_down <= lowest_temp: + break + + # Close out the anneal string + anneal_string += "M140 S0 ; Shut off the bed heater" + "\n" + if heating_zone == "bed_chamber": + anneal_string += "M141 S0 ; Shut off the chamber heater\n" + anneal_string += self.bv_fan_off_str + anneal_string += self.beep_string + if add_messages: + anneal_string += "M117 CoolDown Complete\n" + anneal_string += "M118 CoolDown Complete\n" + anneal_string += ";TYPE:CUSTOM ---------------- End of Anneal\n;" + + # Format the inserted lines. + anneal_lines = anneal_string.split("\n") + for index, line in enumerate(anneal_lines): + if not line.startswith(";") and ";" in line: + front_txt = anneal_lines[index].split(";")[0] + back_txt = anneal_lines[index].split(";")[1] + anneal_lines[index] = front_txt + str(" " * (30 - len(front_txt))) +";" + back_txt + anneal_string = "\n".join(anneal_lines) + "\n" + + end_gcode = anneal_data[-1] + end_lines = end_gcode.split("\n") + + # Comment out the existing M140 S0 lines in the ending gcode. + for num in range(len(end_lines)-1,-1,-1): + if end_lines[num].startswith("M140 S0"): + end_lines[num] = ";M140 S0 ; Shutoff Overide - Anneal or Dry Filament" + anneal_data[-1] = "\n".join(end_lines) + + # If there is a Heated Chamber and it's included then comment out the M141 S0 line + if heating_zone == "bed_chamber" and heated_chamber: + for num in range(0,len(end_lines)-1): + if end_lines[num].startswith("M141 S0"): + end_lines[num] = ";M141 S0 ; Shutoff Overide - Anneal or Dry Filament" + anneal_data[-1] = "\n".join(end_lines) + + # If park head is enabled then dont let the steppers disable until the head is parked + disable_string = "" + for num in range(0,len(end_lines)-1): + if end_lines[num][:3] in ("M84", "M18"): + disable_string = end_lines[num] + "\n" + stepper_timeout = int(wait_time + time_span) + if stepper_timeout > 14400: stepper_timeout = 14400 + end_lines[num] = ";" + end_lines[num] + " ; Overide - Anneal or Dry Filament" + end_lines.insert(num, "M84 S" + str(stepper_timeout) + " ; Increase stepper timeout - Anneal or Dry Filament") + anneal_data[-1] = "\n".join(end_lines) + break + + # The Anneal string is the new end of the gcode so move the 'End of Gcode' comment line in case there are other scripts running + anneal_data[-1] = anneal_data[-1].replace(";End of Gcode", anneal_string + disable_string + ";End of Gcode") + return anneal_data + + def _dry_filament_only( + self, + bed_temperature: int, + chamber_temp: int, + drydata: str, + heated_chamber: bool, + heating_zone: str, + max_y: str, + max_z: str, + speed_travel: str) -> str: + """ + This procedure turns the bed on, homes the printer, parks the head. After the time period the bed is turned off. + There is no actual print in the generated gcode, just a couple of moves to get the nozzle out of the way, and the bed heat (and possibly chamber heat) control. + It allows a user to use the bed to warm up and hopefully dry a filament roll. + + :param bed_temperature: Bed temperature for drying in degrees Celsius + :param chamber_temp: Chamber/build volume temperature for drying in degrees Celsius + :param drydata: The G-code data to be replaced with filament drying commands + :param heated_chamber: Whether the printer has a heated build volume/chamber + :param heating_zone: Zone selection - "bed_only" or "bed_chamber" + :param max_y: Maximum Y axis position for parking as string + :param max_z: Maximum Z axis position (machine height - 20mm) as string + :param speed_travel: Travel speed for positioning moves in mm/min as string + :return: Modified G-code data containing only filament drying sequence + """ + for num in range(2, len(drydata)): + drydata[num] = "" + drydata[0] = drydata[0].split("\n")[0] + "\n" + add_messages = bool(self.getSettingValueByKey("add_messages")) + pause_cmd = self.getSettingValueByKey("pause_cmd") + if pause_cmd != "": + pause_cmd = self.beep_string + pause_cmd + dry_time = self.getSettingValueByKey("dry_time") * 3600 + lines = drydata[1].split("\n") + drying_string = lines[0] + f"\n;............TYPE:CUSTOM: Dry Filament\n{self.beep_string}" + if add_messages: + drying_string += f"M117 Cool Down for {round(dry_time/3600,2)} hr ; Message\n" + drying_string += f"M118 Cool Down for {round(dry_time/3600,2)} hr ; Message\n" + + # M113 sends messages to a print server as a 'Keep Alive' and can generate a lot of traffic over the USB + drying_string += "M113 S0 ; No echo\n" + drying_string += f"M84 S{round(dry_time)} ; Set stepper timeout\n" + drying_string += f"M140 S{bed_temperature} ; Heat bed\n" + drying_string += self.bv_fan_on_str + if heated_chamber and heating_zone == "bed_chamber": + drying_string += f"M141 S{chamber_temp} ; Chamber temp\n" + if pause_cmd == "M0": + pause_cmd = "M0 Clear bed and click...; Pause" + if pause_cmd != "": + drying_string += pause_cmd + " ; Pause\n" + drying_string += "G28 ; Auto-Home\n" + drying_string += f"G0 F{speed_travel} Z{max_z} ; Raise Z to 'ZMax - 20'\n" + drying_string += f"G0 F{speed_travel} X0 Y{max_y} ; Park print head\n" + if dry_time <= 3600: + if add_messages: + drying_string += f"M117 {dry_time/3600} hr remaining ; Message\n" + drying_string += f"M118 {dry_time/3600} hr remaining ; Message\n" + drying_string += f"G4 S{dry_time} ; Dry time\n" + elif dry_time > 3600: + temp_time = dry_time + while temp_time > 3600: + if add_messages: + drying_string += f"M117 {temp_time/3600} hr remaining ; Message\n" + drying_string += f"M118 {temp_time/3600} hr remaining ; Message\n" + drying_string += f"G4 S3600 ; Dry time split\n" + if temp_time > 3600: + temp_time -= 3600 + if temp_time > 0: + if add_messages: + drying_string += f"M117 {temp_time/3600} hr remaining ; Message\n" + drying_string += f"M118 {temp_time/3600} hr remaining ; Message\n" + drying_string += f"G4 S{temp_time} ; Dry time\n" + if heated_chamber and heating_zone == "bed_chamber": + drying_string += f"M141 S0 ; Shut off chamber\n" + drying_string += "M140 S0 ; Shut off bed\n" + drying_string += self.bv_fan_off_str + if self.getSettingValueByKey("beep_when_done"): + beep_duration = self.getSettingValueByKey("beep_duration") + drying_string += self.beep_string + if add_messages: + drying_string += "M117 End of drying cycle ; Message\n" + drying_string += "M118 End of drying cycle ; Message\n" + drying_string += "M84 X Y E ; Disable steppers except Z\n" + drying_string += ";End of Gcode" + + # Format the lines + lines = drying_string.split("\n") + for index, line in enumerate(lines): + if not line.startswith(";") and ";" in line: + front_txt = lines[index].split(";")[0] + back_txt = lines[index].split(";")[1] + lines[index] = front_txt + str(" " * (30 - len(front_txt))) +";" + back_txt + drydata[1] = "\n".join(lines) + "\n" + dry_txt = "; Drying time ...................... " + str(self.getSettingValueByKey("dry_time")) + " hrs\n" + dry_txt += "; Drying temperature ........ " + str(bed_temperature) + "°\n" + if heated_chamber and heating_zone == "bed_chamber": + dry_txt += "; Chamber temperature ... " + str(chamber_temp) + "°\n" + Message(title = "[Dry Filament]", text = dry_txt).show() + drydata[0] = "; <<< This is a filament drying file only. There is no actual print. >>>\n;\n" + dry_txt + ";\n" + return drydata diff --git a/plugins/PostProcessingPlugin/scripts/DisplayInfoOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayInfoOnLCD.py index 63c1c8c788..edfa9d8632 100644 --- a/plugins/PostProcessingPlugin/scripts/DisplayInfoOnLCD.py +++ b/plugins/PostProcessingPlugin/scripts/DisplayInfoOnLCD.py @@ -1,31 +1,36 @@ -# Display Filename and Layer on the LCD by Amanda de Castilho on August 28, 2018 -# Modified: Joshua Pope-Lewis on November 16, 2018 -# Display Progress on LCD by Mathias Lyngklip Kjeldgaard, Alexander Gee, Kimmo Toivanen, Inigo Martinez on July 31, 2019 -# Show Progress was adapted from Display Progress by Louis Wooters on January 6, 2020. His changes are included here. -#--------------------------------------------------------------- -# DisplayNameOrProgressOnLCD.py -# Cura Post-Process plugin -# Combines 'Display Filename and Layer on the LCD' with 'Display Progress' -# Combined and with additions by: GregValiant (Greg Foresi) -# Date: September 8, 2023 -# NOTE: This combined post processor will make 'Display Filename and Layer on the LCD' and 'Display Progress' obsolete -# Description: Display Filename and Layer options: -# Status messages sent to the printer... -# - Scrolling (SCROLL_LONG_FILENAMES) if enabled in Marlin and you aren't printing a small item select this option. -# - Name: By default it will use the name generated by Cura (EG: TT_Test_Cube) - You may enter a custom name here -# - Start Num: Choose which number you prefer for the initial layer, 0 or 1 -# - Max Layer: Enabling this will show how many layers are in the entire print (EG: Layer 1 of 265!) -# - Add prefix 'Printing': Enabling this will add the prefix 'Printing' -# - Example Line on LCD: Printing Layer 0 of 395 3DBenchy -# Display Progress options: -# - Display Total Layer Count -# - Disply Time Remaining for the print -# - Time Fudge Factor % - Divide the Actual Print Time by the Cura Estimate. Enter as a percentage and the displayed time will be adjusted. This allows you to bring the displayed time closer to reality (Ex: Entering 87.5 would indicate an adjustment to 87.5% of the Cura estimate). -# - Example line on LCD: 1/479 | ET 2h13m -# - Time to Pauses changes the M117/M118 lines to countdown to the next pause as 1/479 | TP 2h36m -# - 'Add M118 Line' is available with either option. M118 will bounce the message back to a remote print server through the USB connection. -# - 'Add M73 Line' is used by 'Display Progress' only. There are options to incluse M73 P(percent) and M73 R(time remaining) -# - Enable 'Finish-Time' Message - when enabled, takes the Print Time and calculates when the print will end. It takes into account the Time Fudge Factor. The user may enter a print start time. This is also available for Display Filename. +""" +Display Filename and Layer on the LCD by Amanda de Castilho on August 28, 2018 + Modified: Joshua Pope-Lewis on November 16, 2018 + Display Progress on LCD by Mathias Lyngklip Kjeldgaard, Alexander Gee, Kimmo Toivanen, Inigo Martinez on July 31, 2019 + Show Progress was adapted from Display Progress by Louis Wooters on January 6, 2020. His changes are included here. +--------------------------------------------------------------- + DisplayNameOrProgressOnLCD.py + Cura Post-Process plugin + Combines 'Display Filename and Layer on the LCD' with 'Display Progress' + Combined and with additions by: GregValiant (Greg Foresi) + Date: September 8, 2023 + Date: March 31, 2024 - Bug fix for problem with adding M118 lines if 'Remaining Time' was not checked. + NOTE: This combined post processor will make 'Display Filename and Layer on the LCD' and 'Display Progress' obsolete + Description: Display Filename and Layer options: + Status messages sent to the printer... + - Scrolling (SCROLL_LONG_FILENAMES) if enabled in Marlin and you aren't printing a small item select this option. + - Name: By default it will use the name generated by Cura (EG: TT_Test_Cube) - You may enter a custom name here + - Start Num: Choose which number you prefer for the initial layer, 0 or 1 + - Max Layer: Enabling this will show how many layers are in the entire print (EG: Layer 1 of 265!) + - Add prefix 'Printing': Enabling this will add the prefix 'Printing' + - Example Line on LCD: Printing Layer 0 of 395 3DBenchy + Display Progress options: + - Display Total Layer Count + - Disply Time Remaining for the print + - Time Fudge Factor % - Divide the Actual Print Time by the Cura Estimate. Enter as a percentage and the displayed time will be adjusted. + This allows you to bring the displayed time closer to reality (Ex: Entering 87.5 would indicate an adjustment to 87.5% of the Cura estimate). + - Example line on LCD: 1/479 | ET 2h13m + - Time to Pauses changes the M117/M118 lines to countdown to the next pause as 1/479 | TP 2h36m + - 'Add M118 Line' is available with either option. M118 will bounce the message back to a remote print server through the USB connection. + - 'Add M73 Line' is used by 'Display Progress' only. There are options to incluse M73 P(percent) and M73 R(time remaining) + - Enable 'Finish-Time' Message - when enabled, takes the Print Time and calculates when the print will end. It uses the Time Fudge Factor. The user may enter a print start time. +Date: June 30, 2025 Cost of electricity added to the other print statistics in '_add_stats'. +""" from ..Script import Script from UM.Application import Application @@ -37,6 +42,19 @@ from UM.Message import Message class DisplayInfoOnLCD(Script): + def initialize(self) -> None: + super().initialize() + try: + if Application.getInstance().getGlobalContainerStack().getProperty("print_sequence", "value") == "all_at_once": + enable_countdown = True + self._instance.setProperty("enable_countdown", "value", enable_countdown) + except AttributeError: + # Handle cases where the global container stack or its properties are not accessible + pass + except KeyError: + # Handle cases where the "print_sequence" property is missing + pass + def getSettingDataString(self): return """{ "name": "Display Info on LCD", @@ -77,7 +95,7 @@ class DisplayInfoOnLCD(Script): "label": "Initial layer number:", "description": "Choose which number you prefer for the initial layer, 0 or 1", "type": "int", - "default_value": 0, + "default_value": 1, "minimum_value": 0, "maximum_value": 1, "enabled": "display_option == 'filename_layer'" @@ -114,17 +132,40 @@ class DisplayInfoOnLCD(Script): "default_value": true, "enabled": "display_option == 'display_progress'" }, + "add_m117_line": + { + "label": "Add M117 Line", + "description": "M117 sends a message to the LCD screen. Some screen firmware will not accept or display messages.", + "type": "bool", + "default_value": true + }, "add_m118_line": { "label": "Add M118 Line", "description": "Adds M118 in addition to the M117. It will bounce the message back through the USB port to a computer print server (if a printer server like Octoprint or Pronterface is in use).", "type": "bool", - "default_value": false + "default_value": true + }, + "add_m118_a1": + { + "label": " Add A1 to M118 Line", + "description": "Adds A1 parameter. A1 adds a double foreslash '//' to the response. Octoprint may require this.", + "type": "bool", + "default_value": false, + "enabled": "add_m118_line" + }, + "add_m118_p0": + { + "label": " Add P0 to M118 Line", + "description": "Adds P0 parameter. P0 has the printer send the response out through all it's ports. Octoprint may require this.", + "type": "bool", + "default_value": false, + "enabled": "add_m118_line" }, "add_m73_line": { "label": "Add M73 Line(s)", - "description": "Adds M73 in addition to the M117. For some firmware this will set the printers time and or percentage.", + "description": "Adds M73 in addition to the M117. For some firmware this will set the printers time and or percentage. M75 is added to the beginning of the file and M77 is added to the end of the file. M73 will be added if one or both of the following options is chosen.", "type": "bool", "default_value": false, "enabled": "display_option == 'display_progress'" @@ -132,7 +173,7 @@ class DisplayInfoOnLCD(Script): "add_m73_percent": { "label": " Add M73 Percentage", - "description": "Adds M73 with the P parameter. For some firmware this will set the printers 'percentage' of layers completed and it will count upward.", + "description": "Adds M73 with the P parameter to the start of each layer. For some firmware this will set the printers 'percentage' of layers completed and it will count upward.", "type": "bool", "default_value": false, "enabled": "add_m73_line and display_option == 'display_progress'" @@ -140,10 +181,10 @@ class DisplayInfoOnLCD(Script): "add_m73_time": { "label": " Add M73 Time", - "description": "Adds M73 with the R parameter. For some firmware this will set the printers 'print time' and it will count downward.", + "description": "Adds M73 with the R parameter to the start of each layer. For some firmware this will set the printers 'print time' and it will count downward.", "type": "bool", "default_value": false, - "enabled": "add_m73_line and display_option == 'display_progress'" + "enabled": "add_m73_line and display_option == 'display_progress' and display_remaining_time" }, "speed_factor": { @@ -154,13 +195,29 @@ class DisplayInfoOnLCD(Script): "default_value": 100, "enabled": "enable_end_message or display_option == 'display_progress'" }, + "enable_countdown": + { + "label": "Enable Countdown to Pauses", + "description": "If print sequence is 'one_at_a_time' this is false. This setting is always hidden.", + "type": "bool", + "value": false, + "enabled": false + }, "countdown_to_pause": { "label": "Countdown to Pauses", - "description": "Instead of the remaining print time the LCD will show the estimated time to pause (TP).", + "description": "This must run AFTER any script that adds a pause. Instead of the remaining print time the LCD will show the estimated time to the next layer that has a pause (TP). Countdown to Pause is not available when in One-at-a-Time' mode.", "type": "bool", "default_value": false, - "enabled": "display_option == 'display_progress'" + "enabled": "display_option == 'display_progress' and enable_countdown and display_remaining_time" + }, + "pause_cmd": + { + "label": " What pause command(s) are used?", + "description": "This might be M0, or M25 or M600 if Filament Change is used. If you have mixed commands then delimit them with a comma ',' (Ex: M0,M600). Spaces are not allowed.", + "type": "str", + "default_value": "M0", + "enabled": "display_option == 'display_progress' and countdown_to_pause and enable_countdown and display_remaining_time" }, "enable_end_message": { @@ -173,11 +230,29 @@ class DisplayInfoOnLCD(Script): "print_start_time": { "label": "Print Start Time (Ex 16:45)", - "description": "Use 'Military' time. 16:45 would be 4:45PM. 09:30 would be 9:30AM. If you leave this blank it will be assumed that the print will start Now. If you enter a guesstimate of your printer start time and that time is before 'Now' the guesstimate will consider that the print will start tomorrow at the entered time. ", + "description": "Use 'Military' time. 16:45 would be 4:45PM. 09:30 would be 9:30AM. If you leave this blank it will be assumed that the print will start Now. If you enter a guesstimate of your printer start time and that time is before 'Now' then the guesstimate will consider that the print will start tomorrow at the entered time. ", "type": "str", "default_value": "", "unit": "hrs ", "enabled": "enable_end_message" + }, + "electricity_cost": + { + "label": "Electricity Cost per kWh", + "description": "Cost of electricity per kilowatt-hour. This should be on your electric utility bill.", + "type": "float", + "default_value": 0.151, + "minimum_value": 0, + "unit": "€/kWh " + }, + "printer_power_usage": + { + "label": "Printer Power Usage", + "description": "Average power usage of the 3D printer in Watts. The actual wattage has many variables. 50% of the power supply rating would be a ballpark figure.", + "type": "float", + "default_value": 175, + "minimum_value": 0, + "unit": "Watts " } } @@ -185,239 +260,303 @@ class DisplayInfoOnLCD(Script): def execute(self, data): display_option = self.getSettingValueByKey("display_option") - add_m118_line = self.getSettingValueByKey("add_m118_line") - add_m73_line = self.getSettingValueByKey("add_m73_line") - add_m73_time = self.getSettingValueByKey("add_m73_time") - add_m73_percent = self.getSettingValueByKey("add_m73_percent") - - # This is Display Filename and Layer on LCD--------------------------------------------------------- + self.add_m117_line = self.getSettingValueByKey("add_m117_line") + self.add_m118_line = self.getSettingValueByKey("add_m118_line") + self.add_m118_a1 = self.getSettingValueByKey("add_m118_a1") + self.add_m118_p0 = self.getSettingValueByKey("add_m118_p0") + self.m118_text = "M118 " + self.add_m73_line = self.getSettingValueByKey("add_m73_line") + self.add_m73_time = self.getSettingValueByKey("add_m73_time") + self.add_m73_percent = self.getSettingValueByKey("add_m73_percent") + self.m73_str = "" + para_1 = data[0].split("\n") + for line in para_1: + if line.startswith(";TIME:") or line.startswith(";PRINT.TIME:"): + self.time_total = int(line.split(":")[1]) + break if display_option == "filename_layer": - max_layer = 0 - lcd_text = "M117 " - if self.getSettingValueByKey("file_name") != "": - file_name = self.getSettingValueByKey("file_name") - else: - file_name = Application.getInstance().getPrintInformation().jobName - if self.getSettingValueByKey("addPrefixPrinting"): - lcd_text += "Printing " - if not self.getSettingValueByKey("scroll"): - lcd_text += "Layer " - else: - lcd_text += file_name + " - Layer " - i = self.getSettingValueByKey("startNum") - for layer in data: - display_text = lcd_text + str(i) - layer_index = data.index(layer) - lines = layer.split("\n") - for line in lines: - if line.startswith(";LAYER_COUNT:"): - max_layer = line - max_layer = max_layer.split(":")[1] - if self.getSettingValueByKey("startNum") == 0: - max_layer = str(int(max_layer) - 1) - if line.startswith(";LAYER:"): - if self.getSettingValueByKey("maxlayer"): - display_text = display_text + " of " + max_layer - if not self.getSettingValueByKey("scroll"): - display_text = display_text + " " + file_name - else: - if not self.getSettingValueByKey("scroll"): - display_text = display_text + " " + file_name + "!" - else: - display_text = display_text + "!" - line_index = lines.index(line) - lines.insert(line_index + 1, display_text) - if add_m118_line: - lines.insert(line_index + 2, str(display_text.replace("M117", "M118", 1))) - i += 1 - final_lines = "\n".join(lines) - data[layer_index] = final_lines - if bool(self.getSettingValueByKey("enable_end_message")): - message_str = self.message_to_user(self.getSettingValueByKey("speed_factor") / 100) - Message(title = "Display Info on LCD - Estimated Finish Time", text = message_str[0] + "\n\n" + message_str[1] + "\n" + message_str[2] + "\n" + message_str[3]).show() - return data + data = self._display_filename_layer(data) + else: + data = self._display_progress(data) + return data - # Display Progress (from 'Show Progress' and 'Display Progress on LCD')--------------------------------------- - elif display_option == "display_progress": - # get settings - display_total_layers = self.getSettingValueByKey("display_total_layers") - display_remaining_time = self.getSettingValueByKey("display_remaining_time") - speed_factor = self.getSettingValueByKey("speed_factor") / 100 - m73_time = False - m73_percent = False - if add_m73_line and add_m73_time: - m73_time = True - if add_m73_line and add_m73_percent: - m73_percent = True - # initialize global variables - first_layer_index = 0 - time_total = 0 - number_of_layers = 0 - time_elapsed = 0 - # if at least one of the settings is disabled, there is enough room on the display to display "layer" - first_section = data[0] - lines = first_section.split("\n") + # This is from the original 'Display Filename and Layer on LCD' + def _display_filename_layer(self, data: str) -> str: + data[0] = self._add_stats(data) + max_layer = 0 + format_option = self.getSettingValueByKey("format_option") + lcd_text = "M117 " + octo_text = "M118 " + if self.getSettingValueByKey("file_name") != "": + file_name = self.getSettingValueByKey("file_name") + else: + file_name = Application.getInstance().getPrintInformation().jobName + if self.getSettingValueByKey("addPrefixPrinting"): + lcd_text += "Printing " + octo_text += "Printing " + if not format_option: + lcd_text += "Lay " + octo_text += "Layer " + else: + lcd_text += file_name + " - Layer " + octo_text += file_name + " - Layer " + i = self.getSettingValueByKey("startNum") + for layer in data: + display_text = lcd_text + str(i) + self.m118_text = octo_text + str(i) + layer_index = data.index(layer) + lines = layer.split("\n") for line in lines: - if line.startswith(";TIME:"): - tindex = lines.index(line) - cura_time = int(line.split(":")[1]) - print_time = cura_time * speed_factor - hhh = print_time/3600 - hr = round(hhh // 1) - mmm = round((hhh % 1) * 60) - orig_hhh = cura_time/3600 - orig_hr = round(orig_hhh // 1) - orig_mmm = math.floor((orig_hhh % 1) * 60) - orig_sec = round((((orig_hhh % 1) * 60) % 1) * 60) - if add_m118_line: lines.insert(tindex + 3,"M118 Adjusted Print Time " + str(hr) + "hr " + str(mmm) + "min") - lines.insert(tindex + 3,"M117 ET " + str(hr) + "hr " + str(mmm) + "min") - # add M73 line at beginning - mins = int(60 * hr + mmm) - if m73_time: - lines.insert(tindex + 3, "M73 R{}".format(mins)) - if m73_percent: - lines.insert(tindex + 3, "M73 P0") - # If Countdonw to pause is enabled then count the pauses - pause_str = "" - if bool(self.getSettingValueByKey("countdown_to_pause")): - pause_count = 0 - for num in range(2,len(data) - 1, 1): - if "PauseAtHeight.py" in data[num]: - pause_count += 1 - pause_str = f" with {pause_count} pause(s)" - # This line goes in to convert seconds to hours and minutes - lines.insert(tindex + 3, f";Cura Time Estimate: {cura_time}sec = {orig_hr}hr {orig_mmm}min {orig_sec}sec {pause_str}") - data[0] = "\n".join(lines) - data[len(data)-1] += "M117 Orig Cura Est " + str(orig_hr) + "hr " + str(orig_mmm) + "min\n" - if add_m118_line: data[len(data)-1] += "M118 Est w/FudgeFactor " + str(speed_factor * 100) + "% was " + str(hr) + "hr " + str(mmm) + "min\n" - if not display_total_layers or not display_remaining_time: - base_display_text = "layer " - else: - base_display_text = "" - layer = data[len(data)-1] - data[len(data)-1] = layer.replace(";End of Gcode" + "\n", "") - data[len(data)-1] += ";End of Gcode" + "\n" - # Search for the number of layers and the total time from the start code - for index in range(len(data)): - data_section = data[index] - # We have everything we need, save the index of the first layer and exit the loop - if ";LAYER:" in data_section: - first_layer_index = index - break - else: - for line in data_section.split("\n"): - if line.startswith(";LAYER_COUNT:"): - number_of_layers = int(line.split(":")[1]) - elif line.startswith(";TIME:"): - time_total = int(line.split(":")[1]) - # for all layers... - current_layer = 0 - for layer_counter in range(len(data)-2): - current_layer += 1 - layer_index = first_layer_index + layer_counter - display_text = base_display_text - display_text += str(current_layer) - # create a list where each element is a single line of code within the layer - lines = data[layer_index].split("\n") - if not ";LAYER:" in data[layer_index]: - current_layer -= 1 - continue - # add the total number of layers if this option is checked - if display_total_layers: - display_text += "/" + str(number_of_layers) - # if display_remaining_time is checked, it is calculated in this loop - if display_remaining_time: - time_remaining_display = " | ET " # initialize the time display - m = (time_total - time_elapsed) // 60 # estimated time in minutes - m *= speed_factor # correct for printing time - m = int(m) - h, m = divmod(m, 60) # convert to hours and minutes - # add the time remaining to the display_text - if h > 0: # if it's more than 1 hour left, display format = xhxxm - time_remaining_display += str(h) + "h" - if m < 10: # add trailing zero if necessary - time_remaining_display += "0" - time_remaining_display += str(m) + "m" + if line.startswith(";LAYER_COUNT:"): + max_layer = line + max_layer = max_layer.split(":")[1] + if self.getSettingValueByKey("startNum") == 0: + max_layer = str(int(max_layer) - 1) + if line.startswith(";LAYER:"): + if self.getSettingValueByKey("maxlayer"): + display_text += "/" + max_layer + self.m118_text += "/" + max_layer + if not format_option: + display_text += "|" + file_name + self.m118_text += " | " + file_name else: - time_remaining_display += str(m) + "m" - display_text += time_remaining_display - # find time_elapsed at the end of the layer (used to calculate the remaining time of the next layer) - if not current_layer == number_of_layers: - for line_index in range(len(lines) - 1, -1, -1): - line = lines[line_index] - if line.startswith(";TIME_ELAPSED:"): - # update time_elapsed for the NEXT layer and exit the loop - time_elapsed = int(float(line.split(":")[1])) - break - # insert the text AFTER the first line of the layer (in case other scripts use ";LAYER:") - for l_index, line in enumerate(lines): - if line.startswith(";LAYER:"): + if not format_option: + display_text += "|" + file_name + "!" + self.m118_text += " | " + file_name + "!" + else: + display_text += "!" + self.m118_text += "!" + line_index = lines.index(line) + if self.add_m117_line: + lines.insert(line_index + 1, display_text) + if self.add_m118_line: + if self.add_m118_a1: + self.m118_text = self.m118_text.replace("M118 ","M118 A1 ") + if self.add_m118_p0: + self.m118_text = self.m118_text.replace("M118 ","M118 P0 ") + lines.insert(line_index + 2, self.m118_text) + i += 1 + final_lines = "\n".join(lines) + data[layer_index] = final_lines + if bool(self.getSettingValueByKey("enable_end_message")): + message_str = self._message_to_user(self.getSettingValueByKey("speed_factor") / 100) + Message(title = "Display Info on LCD - Estimated Finish Time", text = message_str[0] + "\n\n" + message_str[1] + "\n" + message_str[2] + "\n" + message_str[3]).show() + return data + + # This is from 'Show Progress on LCD' + def _display_progress(self, data: str) -> str: + # Add some common print settings to the start of the gcode + data[0] = self._add_stats(data) + # Get settings + print_sequence = Application.getInstance().getGlobalContainerStack().getProperty("print_sequence", "value") + display_total_layers = self.getSettingValueByKey("display_total_layers") + display_remaining_time = self.getSettingValueByKey("display_remaining_time") + speed_factor = self.getSettingValueByKey("speed_factor") / 100 + m73_time = False + m73_percent = False + if self.add_m73_line and self.add_m73_time: + m73_time = True + if self.add_m73_line and self.add_m73_percent: + m73_percent = True + if self.add_m73_line: + data[1] = "M75\n" + data[1] + data[len(data)-1] += "M77\n" + # Initialize some variables + first_layer_index = 0 + number_of_layers = 0 + time_elapsed = 0 + + # If at least one of the settings is disabled, there is enough room on the display to display "layer" + first_section = data[0] + lines = first_section.split("\n") + pause_cmd = [] + for line in lines: + if line.startswith(";TIME:"): + tindex = lines.index(line) + cura_time = int(line.split(":")[1]) + print_time = cura_time * speed_factor + hhh = print_time/3600 + hr = round(hhh // 1) + mmm = round((hhh % 1) * 60) + orig_hhh = cura_time/3600 + orig_hr = round(orig_hhh // 1) + orig_mmm = math.floor((orig_hhh % 1) * 60) + if self.add_m118_line: + lines.insert(len(lines) - 2, f"M118 Adjusted Print Time is {hr} hr {mmm} min") + if self.add_m117_line: + lines.insert(len(lines) - 2, f"M117 ET {hr} hr {mmm} min") + # Add M73 line at beginning + mins = int(60 * hr + mmm) + if self.add_m73_line and (self.add_m73_time or self.add_m73_percent): + if m73_time: + self.m73_str += " R{}".format(mins) + if m73_percent: + self.m73_str += " P0" + lines.insert(tindex + 4, "M73" + self.m73_str) + # If Countdown to pause is enabled then count the pauses + pause_str = "" + if bool(self.getSettingValueByKey("countdown_to_pause")): + pause_count = 0 + pause_setting = self.getSettingValueByKey("pause_cmd").upper() + if pause_setting != "": + pause_cmd = [] + if "," in pause_setting: + pause_cmd = pause_setting.split(",") + else: + pause_cmd.append(pause_setting) + for q in range(0, len(pause_cmd)): + pause_cmd[q] = "\n" + pause_cmd[q] + for num in range(2,len(data) - 2, 1): + for q in range(0,len(pause_cmd)): + if pause_cmd[q] in data[num]: + pause_count += data[num].count(pause_cmd[q], 0, len(data[num])) + pause_str = f"with {pause_count} pause" + ("s" if pause_count > 1 else "") + else: + pause_str = "" + # This line goes in to convert seconds to hours and minutes + lines.insert(tindex + 1, f";Cura Time Estimate: {orig_hr}hr {orig_mmm}min {pause_str}") + data[0] = "\n".join(lines) + if self.add_m117_line: + data[len(data)-1] += "M117 Orig Cura Est " + str(orig_hr) + "hr " + str(orig_mmm) + "min\n" + if self.add_m118_line: + data[len(data)-1] += "M118 Est w/FudgeFactor " + str(speed_factor * 100) + "% was " + str(hr) + "hr " + str(mmm) + "min\n" + if not display_total_layers or not display_remaining_time: + base_display_text = "layer " + else: + base_display_text = "" + layer = data[len(data)-1] + data[len(data)-1] = layer.replace(";End of Gcode" + "\n", "") + data[len(data)-1] += ";End of Gcode" + "\n" + # Search for the number of layers and the total time from the start code + for index in range(len(data)): + data_section = data[index] + # We have everything we need, save the index of the first layer and exit the loop + if ";LAYER:" in data_section: + first_layer_index = index + break + else: + for line in data_section.split("\n"): + if line.startswith(";LAYER_COUNT:"): + number_of_layers = int(line.split(":")[1]) + if print_sequence == "one_at_a_time": + number_of_layers = 1 + for lay in range(2,len(data)-1,1): + if ";LAYER:" in data[lay]: + number_of_layers += 1 + # for all layers... + current_layer = 0 + for layer_counter in range(len(data)-2): + current_layer += 1 + layer_index = first_layer_index + layer_counter + display_text = base_display_text + display_text += str(current_layer) + # create a list where each element is a single line of code within the layer + lines = data[layer_index].split("\n") + if not ";LAYER:" in data[layer_index]: + current_layer -= 1 + continue + # add the total number of layers if this option is checked + if display_total_layers: + display_text += "/" + str(number_of_layers) + # if display_remaining_time is checked, it is calculated in this loop + if display_remaining_time: + time_remaining_display = " | ET " # initialize the time display + m = (self.time_total - time_elapsed) // 60 # estimated time in minutes + m *= speed_factor # correct for printing time + m = int(m) + h, m = divmod(m, 60) # convert to hours and minutes + # add the time remaining to the display_text + if h > 0: # if it's more than 1 hour left, display format = xhxxm + time_remaining_display += str(h) + "h" + if m < 10: # add trailing zero if necessary + time_remaining_display += "0" + time_remaining_display += str(m) + "m" + else: + time_remaining_display += str(m) + "m" + display_text += time_remaining_display + # find time_elapsed at the end of the layer (used to calculate the remaining time of the next layer) + if not current_layer == number_of_layers: + for line_index in range(len(lines) - 1, -1, -1): + line = lines[line_index] + if line.startswith(";TIME_ELAPSED:"): + # update time_elapsed for the NEXT layer and exit the loop + time_elapsed = int(float(line.split(":")[1])) + break + # insert the text AFTER the first line of the layer (in case other scripts use ";LAYER:") + for l_index, line in enumerate(lines): + if line.startswith(";LAYER:"): + if self.add_m117_line: lines[l_index] += "\nM117 " + display_text - # add M73 line + if self.add_m118_line: + m118_text = "\nM118 " + if self.add_m118_a1: + m118_text += "A1 " + if self.add_m118_p0: + m118_text += "P0 " + lines[l_index] += m118_text + display_text + # add M73 line + if display_remaining_time: mins = int(60 * h + m) - if m73_time: - lines[l_index] += "\nM73 R{}".format(mins) + if self.add_m73_line and (self.add_m73_time or self.add_m73_percent): + self.m73_str = "" + if m73_time and display_remaining_time: + self.m73_str += " R{}".format(mins) if m73_percent: - lines[l_index] += "\nM73 P" + str(round(int(current_layer) / int(number_of_layers) * 100)) - if add_m118_line: - lines[l_index] += "\nM118 " + display_text - break - # overwrite the layer with the modified layer - data[layer_index] = "\n".join(lines) + self.m73_str += " P" + str(round(int(current_layer) / int(number_of_layers) * 100)) + lines[l_index] += "\nM73" + self.m73_str + break + # overwrite the layer with the modified layer + data[layer_index] = "\n".join(lines) # If enabled then change the ET to TP for 'Time To Pause' - if bool(self.getSettingValueByKey("countdown_to_pause")): - time_list = [] - time_list.append("0") - time_list.append("0") - this_time = 0 - pause_index = 1 + time_list = [] + if bool(self.getSettingValueByKey("countdown_to_pause")): + time_list.append("0") + time_list.append("0") + this_time = 0 + pause_index = 1 - # Get the layer times - for num in range(2,len(data) - 1): - layer = data[num] - lines = layer.split("\n") - for line in lines: - if line.startswith(";TIME_ELAPSED:"): - this_time = (float(line.split(":")[1]))*speed_factor - time_list.append(str(this_time)) - if "PauseAtHeight.py" in layer: + # Get the layer times + for num in range(2,len(data) - 1): + layer = data[num] + lines = layer.split("\n") + for line in lines: + if line.startswith(";TIME_ELAPSED:"): + this_time = (float(line.split(":")[1]))*speed_factor + time_list.append(str(this_time)) + for p_cmd in pause_cmd: + if p_cmd in layer: for qnum in range(num - 1, pause_index, -1): time_list[qnum] = str(float(this_time) - float(time_list[qnum])) + "P" pause_index = num-1 + break - # Make the adjustments to the M117 (and M118) lines that are prior to a pause - for num in range (2, len(data) - 1,1): - layer = data[num] - lines = layer.split("\n") - for line in lines: + # Make the adjustments to the M117 (and M118) lines that are prior to a pause + for num in range (2, len(data) - 1,1): + layer = data[num] + lines = layer.split("\n") + for line in lines: + try: if line.startswith("M117") and "|" in line and "P" in time_list[num]: - M117_line = line.split("|")[0] + "| TP " - alt_time = time_list[num][:-1] - hhh = int(float(alt_time) / 3600) - if hhh > 0: - hhr = str(hhh) + "h" - else: - hhr = "" - mmm = ((float(alt_time) / 3600) - (int(float(alt_time) / 3600))) * 60 - sss = int((mmm - int(mmm)) * 60) - mmm = str(round(mmm)) + "m" - time_to_go = str(hhr) + str(mmm) - if hhr == "": time_to_go = time_to_go + str(sss) + "s" - M117_line = M117_line + time_to_go + time_to_go = self._get_time_to_go(time_list[num]) + M117_line = line.split("|")[0] + "| TP " + time_to_go layer = layer.replace(line, M117_line) if line.startswith("M118") and "|" in line and "P" in time_list[num]: + time_to_go = self._get_time_to_go(time_list[num]) M118_line = line.split("|")[0] + "| TP " + time_to_go layer = layer.replace(line, M118_line) - data[num] = layer - setting_data = "" - if bool(self.getSettingValueByKey("enable_end_message")): - message_str = self.message_to_user(speed_factor) - Message(title = "[Display Info on LCD] - Estimated Finish Time", text = message_str[0] + "\n\n" + message_str[1] + "\n" + message_str[2] + "\n" + message_str[3]).show() + except: + continue + data[num] = layer + if bool(self.getSettingValueByKey("enable_end_message")): + message_str = self._message_to_user(data, speed_factor, pause_cmd) + Message(title = "[Display Info on LCD] - Estimated Finish Time", text = message_str[0] + "\n\n" + message_str[1] + "\n" + message_str[2] + "\n" + message_str[3]).show() return data - def message_to_user(self, speed_factor: float): - # Message the user of the projected finish time of the print + def _message_to_user(self, data: str, speed_factor: float, pause_cmd: str) -> str: + """ + Message the user of the projected finish time of the print and when any pauses might occur + """ print_time = Application.getInstance().getPrintInformation().currentPrintTime.getDisplayString(DurationFormat.Format.ISO8601) print_start_time = self.getSettingValueByKey("print_start_time") # If the user entered a print start time make sure it is in the correct format or ignore it. @@ -476,8 +615,97 @@ class DisplayInfoOnLCD(Script): if print_start_time != "": print_start_str = "Print Start Time................." + str(print_start_time) + "hrs" else: - print_start_str = "Print Start Time.................Now." + print_start_str = "Print Start Time.................Now" estimate_str = "Cura Time Estimate.........." + str(print_time) adjusted_str = "Adjusted Time Estimate..." + str(time_change) - finish_str = week_day + " " + str(mo_str) + " " + str(new_time.strftime("%d")) + ", " + str(new_time.strftime("%Y")) + " at " + str(show_hr) + str(new_time.strftime("%M")) + str(show_ampm) - return finish_str, estimate_str, adjusted_str, print_start_str \ No newline at end of file + finish_str = f"{week_day} {mo_str} {new_time.strftime('%d')}, {new_time.strftime('%Y')} at {show_hr}{new_time.strftime('%M')}{show_ampm}" + + # If there are pauses and if countdown is enabled, then add the time-to-pause to the message. + if bool(self.getSettingValueByKey("countdown_to_pause")): + num = 1 + for layer in data: + for p_cmd in pause_cmd: + if p_cmd in layer or "Do the actual pause" in layer: + adjusted_str += "\n" + self._get_time_to_go(layer.split("TIME_ELAPSED:")[1].split("\n")[0]) + " ET from start to pause #" + str(num) + num += 1 + return finish_str, estimate_str, adjusted_str, print_start_str + + def _get_time_to_go(self, time_str: str): + """ + Converts a time string in seconds to a human-readable format (e.g., "2h30m"). + :param time_str: The time string in seconds. + :return: A formatted string representing the time. + """ + alt_time = time_str[:-1] + total_seconds = float(alt_time) + hours = int(total_seconds // 3600) + minutes = int((total_seconds % 3600) // 60) + seconds = int(total_seconds % 60) + time_to_go = f"{hours}h" if hours > 0 else "" + time_to_go += f"{minutes}m" + if hours == 0: + time_to_go += f"{seconds}s" + return time_to_go + + def _add_stats(self, data: str) -> str: + global_stack = Application.getInstance().getGlobalContainerStack() + """ + Make a list of the models in the file. + Add some of the filament stats to the first section of the gcode. + """ + model_list = [] + for mdex, layer in enumerate(data): + layer = data[mdex].split("\n") + for line in layer: + if line.startswith(";MESH:") and "NONMESH" not in line: + model_name = line.split(":")[1] + if not model_name in model_list: + model_list.append(model_name) + # Filament stats + extruder_count = global_stack.getProperty("machine_extruder_count", "value") + layheight_0 = global_stack.getProperty("layer_height_0", "value") + init_layer_hgt_line = ";Initial Layer Height: " + f"{layheight_0:.2f}".format(layheight_0) + filament_line_t0 = ";Extruder 1 (T0)\n" + filament_amount = Application.getInstance().getPrintInformation().materialLengths + filament_line_t0 += f"; Filament used: {filament_amount[0]}m\n" + filament_line_t0 += f"; Filament Type: {global_stack.extruderList[0].material.getMetaDataEntry("material", "")}\n" + filament_line_t0 += f"; Filament Dia.: {global_stack.extruderList[0].getProperty("material_diameter", "value")}mm\n" + filament_line_t0 += f"; Nozzle Size : {global_stack.extruderList[0].getProperty("machine_nozzle_size", "value")}mm\n" + filament_line_t0 += f"; Print Temp. : {global_stack.extruderList[0].getProperty("material_print_temperature", "value")}°\n" + filament_line_t0 += f"; Bed Temp. : {global_stack.extruderList[0].getProperty("material_bed_temperature", "value")}°" + + # if there is more than one extruder then get the stats for the second one. + filament_line_t1 = "" + if extruder_count > 1: + filament_line_t1 = "\n;Extruder 2 (T1)\n" + filament_line_t1 += f"; Filament used: {filament_amount[1]}m\n" + filament_line_t1 += f"; Filament Type: {global_stack.extruderList[1].material.getMetaDataEntry("material", "")}\n" + filament_line_t1 += f"; Filament Dia.: {global_stack.extruderList[1].getProperty("material_diameter", "value")}mm\n" + filament_line_t1 += f"; Nozzle Size : {global_stack.extruderList[1].getProperty("machine_nozzle_size", "value")}mm\n" + filament_line_t1 += f"; Print Temp. : {global_stack.extruderList[1].getProperty("material_print_temperature", "value")}°" + + # Calculate the cost of electricity for the print + electricity_cost = self.getSettingValueByKey("electricity_cost") + printer_power_usage = self.getSettingValueByKey("printer_power_usage") + currency_unit = Application.getInstance().getPreferences().getValue("cura/currency") + total_cost_electricity = (printer_power_usage / 1000) * (self.time_total / 3600) * electricity_cost + + # Add the stats to the gcode file + lines = data[0].split("\n") + for index, line in enumerate(lines): + if line.startswith(";Layer height:") or line.startswith(";TARGET_MACHINE.NAME:"): + lines[index] = ";Layer height: " + f"{global_stack.getProperty("layer_height", "value")}" + lines[index] += f"\n{init_layer_hgt_line}" + lines[index] += f"\n;Base Quality Name : '{global_stack.quality.getMetaDataEntry("name", "")}'" + lines[index] += f"\n;Custom Quality Name: '{global_stack.qualityChanges.getMetaDataEntry("name")}'" + if line.startswith(";Filament used"): + lines[index] = filament_line_t0 + filament_line_t1 + f"\n;Electric Cost: {currency_unit}{total_cost_electricity:.2f}".format(total_cost_electricity) + # The target machine "machine_name" is actually the printer model. This adds the user defined printer name to the "TARGET_MACHINE" line. + if line.startswith(";TARGET_MACHINE"): + machine_model = str(global_stack.getProperty("machine_name", "value")) + machine_name = str(global_stack.getName()) + lines[index] += f" / {machine_name}" + if "MINX" in line or "MIN.X" in line: + # Add the Object List + lines[index - 1] += f"\n;Model List: {str(model_list)}" + return "\n".join(lines) \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/scripts/TweakAtZ.py b/plugins/PostProcessingPlugin/scripts/TweakAtZ.py new file mode 100644 index 0000000000..adb610c949 --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/TweakAtZ.py @@ -0,0 +1,989 @@ +""" + TweakAtZ 2.0 is a re-write of ChangeAtZ by GregValiant (Greg Foresi) March 2025 + The script name change was required to avoid conflicts with project files that might use ChangeAtZ variables. + Differences from the previous ChangeAtZ version (5.3.0): + ~"By Height" will work with Z-hops enabled, Adaptive Layers, Scarf Z-seam, and Rafts. The changes will commence at the first layer where the height is reached or exceeded. The changes will end at the start of the layer where the End Height is reached or exceeded. + ~The user can opt to change just the print speed or both print and travel speeds. The 'F' parameters are re-calculated line-by-line using the percentage that the user inputs. Speeds can now be changed 'per extruder'. M220 is no longer used to change speeds as it affected all speeds. + ~Changing the print speed no longer affects retraction or unretract speeds. + ~The Z-hop speed is never affected. + ~The 'Output to LCD' setting is obsolete to avoid flooding the screen with messages that were quickly over-written. + ~Allows the user to select a Range of Layers (rather than just 'Single Layer' or 'To the End'.) + ~Added support for control of a single fan. This might be a Build Volume Fan, Auxilliary Fan, or a Layer Cooling Fan. It would depend on the fan circuit number that the user inputs. + ~Added support for Relative Extrusion + ~Added support for Firmware Retraction + ~Added support for 'G2' and 'G3' moves. + ~The script supports a maximum of 2 extruders. + ~'One-at-a-Time' is not supported and a kick-out is added + + Previous contributions by: + Original Authors and contributors to the ChangeAtZ post-processing script and the earlier TweakAtZ: + Written by Steven Morlock, + Modified by Ricardo Gomez, to add Bed Temperature and make it work with Cura_13.06.04+ + Modified by Stefan Heule, since V3.0 + Modified by Jaime van Kessel (Ultimaker), to make it work for 15.10 / 2.x + Modified by Ghostkeeper (Ultimaker), to debug. + Modified by Wes Hanney, Retract Length + Speed, Clean up + Modified by Alex Jaxon, Added option to modify Build Volume Temperature + Re-write by GregValiant, to work with new variables in Cura 5.x and with the changes noted above +""" + +from UM.Application import Application +from ..Script import Script +import re +from UM.Message import Message +from UM.Logger import Logger + +class TweakAtZ(Script): + version = "2.0.0" + + def initialize(self) -> None: + """ + Prepare the script settings for the machine hardware configuration on Cura opening + """ + super().initialize() + self.global_stack = Application.getInstance().getGlobalContainerStack() + self.extruder_count = int(self.global_stack.getProperty("machine_extruder_count", "value")) + # If the printer is multi-extruder then enable the settings for T1 + if self.extruder_count == 1: + self._instance.setProperty("multi_extruder", "value", False) + else: + self._instance.setProperty("multi_extruder", "value", True) + + # Enable the build volume temperature change when a heated build volume is present + machine_heated_build_volume = bool(self.global_stack.getProperty("machine_heated_build_volume", "value")) + if machine_heated_build_volume: + self._instance.setProperty("heated_build_volume", "value", True) + else: + self._instance.setProperty("heated_build_volume", "value", False) + + # If it doesn't have a heated bed it is unlikely to have a Chamber or Auxiliary fan. + has_heated_bed = bool(self.global_stack.getProperty("machine_heated_bed", "value")) + if has_heated_bed: + self._instance.setProperty("has_bv_fan", "value", True) + + def getSettingDataString(self): + return """{ + "name": "Tweak At Z (2.0)", + "key": "TweakAtZ", + "metadata": {}, + "version": 2, + "settings": { + "taz_enabled": { + "label": "Enable Tweak at Z", + "description": "Enables the script so it will run. You may have more than one instance of 'Tweak At Z' in the list of post processors.", + "type": "bool", + "default_value": true, + "enabled": true + }, + "by_layer_or_height": { + "label": "'By Layer' or 'By Height'", + "description": "Which criteria to use to start and end the changes.", + "type": "enum", + "options": + { + "by_layer": "By Layer", + "by_height": "By Height" + }, + "default_value": "by_layer", + "enabled": "taz_enabled" + }, + "a_start_layer": { + "label": "Start Layer", + "description": "Layer number to start the changes at. Use the Cura preview layer numbers. The changes will start at the beginning of the layer.", + "type": "int", + "default_value": 1, + "minimum_value": -7, + "minimum_value_warning": 1, + "unit": "Layer #", + "enabled": "taz_enabled and by_layer_or_height == 'by_layer'" + }, + "a_end_layer": { + "label": "End Layer", + "description": "Use '-1' to indicate the end of the last layer. The changes will end at the end of the indicated layer. Use the Cura preview layer number. If the 'Start Layer' is equal to the 'End Layer' then the changes only affect that single layer.", + "type": "int", + "default_value": -1, + "unit": "Layer #", + "enabled": "taz_enabled and by_layer_or_height == 'by_layer'" + }, + "a_height_start": { + "label": "Height Start of Changes", + "description": "Enter the 'Z-Height' to Start the changes at. The changes START at the beginning of the first layer where this height is reached (or exceeded). If the model is on a raft then this height will be from the top of the air gap (first height of the actual model print).", + "type": "float", + "default_value": 0, + "unit": "mm", + "enabled": "taz_enabled and by_layer_or_height == 'by_height'" + }, + "a_height_end": { + "label": "Height End of Changes", + "description": "Enter the 'Z-Height' to End the changes at. The changes continue until this height is reached or exceeded. If the model is on a raft then this height will be from the top of the air gap (first height of the actual model print).", + "type": "float", + "default_value": 0, + "unit": "mm", + "enabled": "taz_enabled and by_layer_or_height == 'by_height'" + }, + "b_change_speed": { + "label": "Change Speeds", + "description": "Check to enable a speed change for the Print Speeds.", + "type": "bool", + "default_value": false, + "enabled": "taz_enabled" + }, + "change_speed_per_extruder": { + "label": " Which extruder(s)", + "description": "For multi-extruder printers the changes can be for either or both extruders.", + "type": "enum", + "options": { + "ext_0": "Extruder 1 (T0)", + "ext_1": "Extruder 2 (T1)", + "ext_both": "Both extruders"}, + "default_value": "ext_both", + "enabled": "taz_enabled and b_change_speed and multi_extruder" + }, + "b_change_printspeed": { + "label": " Include Travel Speeds", + "description": "Check this box to change the Travel Speeds as well as the Print Speeds.", + "type": "bool", + "default_value": false, + "enabled": "b_change_speed and taz_enabled" + }, + "b_speed": { + "label": " Speed %", + "description": "Speed factor as a percentage. The chosen speeds will be altered by this much.", + "unit": "% ", + "type": "int", + "default_value": 100, + "minimum_value": 10, + "minimum_value_warning": 50, + "maximum_value_warning": 200, + "enabled": "b_change_speed and taz_enabled" + }, + "c_change_flowrate": { + "label": "Change Flow Rate", + "description": "Select to change the flow rate of all extrusions in the layer range. This command uses M221 to set the flow percentage in the printer.", + "type": "bool", + "default_value": false, + "enabled": "taz_enabled" + }, + "c_flowrate_t0": { + "label": " Flow Rate % (T0)", + "description": "Enter the new Flow Rate Percentage. For a multi-extruder printer this will apply to Extruder 1 (T0).", + "unit": "% ", + "type": "int", + "default_value": 100, + "minimum_value": 25, + "minimum_value_warning": 50, + "maximum_value_warning": 150, + "maximum_value": 200, + "enabled": "c_change_flowrate and taz_enabled" + }, + "multi_extruder": { + "label": "Hidden setting to enable 2nd extruder settings for multi-extruder printers.", + "description": "Enable T1 options.", + "type": "bool", + "value": false, + "default_value": false, + "enabled": false + }, + "c_flowrate_t1": { + "label": " Flow Rate % T1", + "description": "New Flow rate percentage for Extruder 2 (T1).", + "unit": "% ", + "type": "int", + "default_value": 100, + "minimum_value": 1, + "minimum_value_warning": 10, + "maximum_value_warning": 200, + "enabled": "multi_extruder and c_change_flowrate and taz_enabled" + }, + "d_change_bed_temp": { + "label": "Change Bed Temp", + "description": "Select if Bed Temperature is to be changed. The bed temperature will revert at the End Layer.", + "type": "bool", + "default_value": false, + "enabled": "taz_enabled" + }, + "d_bedTemp": { + "label": " Bed Temp", + "description": "New Bed Temperature", + "unit": "°C ", + "type": "int", + "default_value": 60, + "minimum_value": 0, + "minimum_value_warning": 30, + "maximum_value_warning": 120, + "enabled": "d_change_bed_temp and taz_enabled" + }, + "heated_build_volume": { + "label": "Hidden setting", + "description": "This enables the build volume settings", + "type": "bool", + "default_value": false, + "enabled": false + }, + "e_change_build_volume_temperature": { + "label": "Change Build Volume Temperature", + "description": "Select if Build Volume Temperature is to be changed", + "type": "bool", + "default_value": false, + "enabled": "heated_build_volume and taz_enabled" + }, + "e_build_volume_temperature": { + "label": " Build Volume Temperature", + "description": "New Build Volume Temperature. This will revert at the end of the End Layer.", + "unit": "°C ", + "type": "int", + "default_value": 20, + "minimum_value": 0, + "minimum_value_warning": 15, + "maximum_value_warning": 80, + "enabled": "heated_build_volume and e_change_build_volume_temperature and taz_enabled" + }, + "f_change_extruder_temperature": { + "label": "Change Print Temp", + "description": "Select if the Printing Temperature is to be changed", + "type": "bool", + "default_value": false, + "enabled": "taz_enabled" + }, + "f_extruder_temperature_t0": { + "label": " Extruder 1 Temp (T0)", + "description": "New temperature for Extruder 1 (T0).", + "unit": "°C ", + "type": "int", + "default_value": 190, + "minimum_value": 0, + "minimum_value_warning": 160, + "maximum_value_warning": 250, + "enabled": "f_change_extruder_temperature and taz_enabled" + }, + "f_extruder_temperature_t1": { + "label": " Extruder 2 Temp (T1)", + "description": "New temperature for Extruder 2 (T1).", + "unit": "°C ", + "type": "int", + "default_value": 190, + "minimum_value": 0, + "minimum_value_warning": 160, + "maximum_value_warning": 250, + "enabled": "multi_extruder and f_change_extruder_temperature and taz_enabled" + }, + "g_change_retract": { + "label": "Change Retraction Settings", + "description": "Indicates you would like to modify retraction properties. If 'Firmware Retraction' is enabled then M207 and M208 lines are added. Your firmware must understand those commands.", + "type": "bool", + "default_value": false, + "enabled": "taz_enabled and not multi_extruder" + }, + "g_change_retract_speed": { + "label": " Change Retract/Prime Speed", + "description": "Changes the retraction and prime speed.", + "type": "bool", + "default_value": false, + "enabled": "g_change_retract and taz_enabled and not multi_extruder" + }, + "g_retract_speed": { + "label": " Retract/Prime Speed", + "description": "New Retract Feed Rate (mm/s). If 'Firmware Retraction' is enabled then M207 and M208 are used to change the retract and prime speeds and the distance. NOTE: the same speed will be used for both retract and prime.", + "unit": "mm/s ", + "type": "float", + "default_value": 40, + "minimum_value": 1, + "minimum_value_warning": 0, + "maximum_value_warning": 100, + "enabled": "g_change_retract and g_change_retract_speed and taz_enabled and not multi_extruder" + }, + "g_change_retract_amount": { + "label": " Change Retraction Amount", + "description": "Changes the retraction length during print", + "type": "bool", + "default_value": false, + "enabled": "g_change_retract and taz_enabled and not multi_extruder" + }, + "g_retract_amount": { + "label": " Retract Amount", + "description": "New Retraction Distance (mm). If firmware retraction is used then M207 and M208 are used to change the retract and prime amount.", + "unit": "mm ", + "type": "float", + "default_value": 6.5, + "minimum_value": 0, + "maximum_value_warning": 20, + "enabled": "g_change_retract and g_change_retract_amount and taz_enabled and not multi_extruder" + }, + "enable_bv_fan_change": { + "label": "Chamber/Aux Fan Change", + "description": "Can alter the setting of a secondary fan when the printer is equipped with one.", + "type": "bool", + "default_value": false, + "enabled": "has_bv_fan and taz_enabled" + }, + "e1_build_volume_fan_speed": { + "label": " Chamber/Aux Fan Speed", + "description": "New Build Volume or Auxiliary Fan Speed. This will reset to zero at the end of the 'End Layer'.", + "unit": "%", + "type": "int", + "default_value": 100, + "minimum_value": 0, + "maximum_value": 100, + "enabled": "has_bv_fan and enable_bv_fan_change and taz_enabled" + }, + "bv_fan_nr": { + "label": " Chamber/Aux Fan Number", + "description": "The circuit number of the Auxilliary or Chamber fan. M106 will be used and the 'P' parameter (the fan number) will be the number entered here.", + "type": "int", + "unit": "#", + "default_value": 3, + "minimum_value": 0, + "enabled": "has_bv_fan and enable_bv_fan_change and taz_enabled" + }, + "has_bv_fan": { + "label": "Hidden setting", + "description": "Enables the Build Volume/Auxiliary fan speed control when 'machine_heated_bed' is true.", + "type": "bool", + "default_value": false, + "enabled": false + } + } + }""" + + def execute(self, data): + # Exit if the script isn't enabled + if not bool(self.getSettingValueByKey("taz_enabled")): + data[0] += "; [Tweak at Z] is not enabled\n" + Logger.log("i", "[Tweak at Z] is not enabled") + return data + + # Message the user and exit if the print sequence is 'One at a Time' + if self.global_stack.getProperty("print_sequence", "value") == "one_at_a_time": + Message(title = "[Tweak at Z]", text = "One-at-a-Time mode is not supported. The script will exit without making any changes.").show() + data[0] += "; [Tweak at Z] Did not run (One at a Time mode is not supported)\n" + Logger.log("i", "TweakAtZ does not support 'One at a Time' mode") + return data + + # Exit if the gcode has been previously post-processed. + if ";POSTPROCESSED" in data[0]: + return data + + # Pull some settings from Cura + self.extruder_list = self.global_stack.extruderList + self.firmware_retraction = bool(self.global_stack.getProperty("machine_firmware_retract", "value")) + self.relative_extrusion = bool(self.global_stack.getProperty("relative_extrusion", "value")) + self.initial_layer_height = self.global_stack.getProperty("layer_height_0", "value") + self.heated_build_volume = bool(self.global_stack.getProperty("machine_heated_build_volume", "value")) + self.heated_bed = bool(self.global_stack.getProperty("machine_heated_bed", "value")) + self.retract_enabled = bool(self.extruder_list[0].getProperty("retraction_enable", "value")) + self.orig_bed_temp = self.global_stack.getProperty("material_bed_temperature", "value") + self.orig_bv_temp = self.global_stack.getProperty("build_volume_temperature", "value") + self.z_hop_enabled = bool(self.extruder_list[0].getProperty("retraction_hop_enabled", "value")) + self.raft_enabled = True if str(self.global_stack.getProperty("adhesion_type", "value")) == "raft" else False + # The Start and end layer numbers are used when 'By Layer' is selected + self.start_layer = self.getSettingValueByKey("a_start_layer") - 1 + end_layer = int(self.getSettingValueByKey("a_end_layer")) + nbr_raft_layers = 0 + if self.raft_enabled: + for layer in data: + if ";LAYER:-" in layer: + nbr_raft_layers += 1 + if ";LAYER:0\n" in layer: + break + + # Adjust the start layer to account for any raft layers + self.start_layer -= nbr_raft_layers + + # Find the indexes of the Start and End layers if 'By Layer' + self.start_index = 0 + + # When retraction is enabled it adds a single line item to the data list + self.end_index = len(data) - 1 - int(self.retract_enabled) + if self.getSettingValueByKey("by_layer_or_height") == "by_layer": + for index, layer in enumerate(data): + if ";LAYER:" + str(self.start_layer) + "\n" in layer: + self.start_index = index + break + + # If the changes continue to the top layer + if end_layer == -1: + if self.retract_enabled: + self.end_index = len(data) - 2 + else: + self.end_index = len(data) - 1 + + # If the changes end below the top layer + else: + + # Adjust the end layer from base1 numbering to base0 numbering + end_layer -= 1 + + # Adjust the End Layer if it is not the top layer and if bed adhesion is 'raft' + end_layer -= nbr_raft_layers + for index, layer in enumerate(data): + if ";LAYER:" + str(end_layer) + "\n" in layer: + self.end_index = index + break + + # The Start and End heights are used to find the Start and End indexes when changes are 'By Height' + elif self.getSettingValueByKey("by_layer_or_height") == "by_height": + start_height = float(self.getSettingValueByKey("a_height_start")) + end_height = float(self.getSettingValueByKey("a_height_end")) + # Get the By Height start and end indexes + self.start_index = self._is_legal_z(data, start_height) + self.end_index = self._is_legal_z(data, end_height) - 1 + + # Exit if the Start Layer wasn't found + if self.start_index == 0: + Message(title = "[Tweak at Z]", text = "The 'Start Layer' is beyond the top of the print. The script did not run.").show() + Logger.log("w", "[Tweak at Z] The 'Start Layer' is beyond the top of the print. The script did not run.") + return data + + # Adjust the End Index if the End Index < Start Index (required for the script to make changes) + if self.end_index < self.start_index: + self.start_index = self.end_index + Message(title = "[Tweak at Z]", text = "Check the Gcode. Your 'Start Layer/Height' input is higher than the End Layer/Height input. The Start Layer has been adjusted to equal the End Layer.").show() + + # Map settings to corresponding methods + procedures = { + "b_change_speed": self._change_speed, + "c_change_flowrate": self._change_flow, + "d_change_bed_temp": self._change_bed_temp, + "e_change_build_volume_temperature": self._change_bv_temp, + "f_change_extruder_temperature": self._change_hotend_temp, + "g_change_retract": self._change_retract, + "has_bv_fan": self._change_bv_fan_speed + } + + # Run the selected procedures + for setting, method in procedures.items(): + if self.getSettingValueByKey(setting): + method(data) + data = self._format_lines(data) + return data + + def _change_speed(self, data:str)->str: + """ + The actual speed will be a percentage of the Cura calculated 'F' values in the gcode. The percentage can be different for each extruder. Travel speeds can also be affected dependent on the user input. + :params: + speed_x: The speed percentage to use + print_speed_only: Only change speeds with extrusions (but not retract or primes) + target_extruder: For multi-extruder printers this is the active extruder + off_extruder: For multi-extruders this is the inactive extruder. + """ + # Since a single extruder changes all relevant speed settings then for a multi-extruder 'both extruders' is the same + if self.extruder_count == 1 or self.getSettingValueByKey("change_speed_per_extruder") == "ext_both": + speed_x = self.getSettingValueByKey("b_speed")/100 + print_speed_only = not bool(self.getSettingValueByKey("b_change_printspeed")) + for index, layer in enumerate(data): + if index >= self.start_index and index <= self.end_index: + lines = layer.splitlines() + for l_index, line in enumerate(lines): + if self._f_x_y_not_z(line): + f_value = self.getValue(line, "F") + if line.startswith(("G1", "G2", "G3")): + lines[l_index] = line.replace("F" + str(f_value), "F" + str(round(f_value * speed_x))) + lines[l_index] += f" ; TweakAtZ: {round(speed_x * 100)}% Print Speed" + continue + if not print_speed_only and line.startswith("G0"): + lines[l_index] = line.replace("F" + str(f_value), "F" + str(round(f_value * speed_x))) + lines[l_index] += f" ; TweakAtZ: {round(speed_x * 100)}% Travel Speed" + data[index] = "\n".join(lines) + "\n" + elif self.extruder_count > 1: + speed_x = self.getSettingValueByKey("b_speed")/100 + print_speed_only = not bool(self.getSettingValueByKey("b_change_printspeed")) + target_extruder = self.getSettingValueByKey("change_speed_per_extruder") + + # These variables are used as the 'turn changes on' and 'turn changes off' at tool changes. + if target_extruder == "ext_0": + target_extruder = "T0" + off_extruder = "T1" + elif target_extruder == "ext_1": + target_extruder = "T1" + off_extruder = "T0" + + # After all of that it goes to work. + for index, layer in enumerate(data): + if index < self.start_index: + lineT = layer.splitlines() + for tline in lineT: + if "T0" in tline: + active_tool = "T0" + if "T1" in tline: + active_tool = "T1" + if index >= self.start_index and index <= self.end_index: + lines = layer.splitlines() + for l_index, line in enumerate(lines): + if active_tool == target_extruder: + if self._f_x_y_not_z(line): + f_value = self.getValue(line, "F") + if line.startswith(("G1", "G2", "G3")): + lines[l_index] = line.replace("F" + str(f_value), "F" + str(round(f_value * speed_x))) + lines[l_index] += f" ; TweakAtZ: {round(speed_x * 100)}% Print Speed" + continue + if not print_speed_only and line.startswith("G0"): + lines[l_index] = line.replace("F" + str(f_value), "F" + str(round(f_value * speed_x))) + lines[l_index] += f" ; TweakAtZ: {round(speed_x * 100)}% Travel Speed" + if line.startswith(off_extruder): + active_tool = off_extruder + if line.startswith(target_extruder): + active_tool = target_extruder + + data[index] = "\n".join(lines) + "\n" + return data + + def _change_flow(self, data:str)->str: + """ + M221 is used to change the flow rate. + :params: + new_flow_ext_0: The flowrate percentage from these script settings (for the primary extruder) + new_flowrate_0: The string to use for the new flowrate for T0 + reset_flowrate_0: Resets the flowrate to 100% (for either extruder) + new_flow_ext_1: The flowrate percentage from these script settings (for the secondary extruder) + new_flowrate_1: The string to use for the new flowrate for T1 + """ + new_flow_ext_0 = self.getSettingValueByKey("c_flowrate_t0") + new_flowrate_0 = f"\nM221 S{new_flow_ext_0} ; TweakAtZ: Alter Flow Rate" + reset_flowrate_0 = "\nM221 S100 ; TweakAtZ: Reset Flow Rate" + if self.extruder_count > 1: + new_flow_ext_1 = self.getSettingValueByKey("c_flowrate_t1") + new_flowrate_1 = f"\nM221 S{new_flow_ext_1} ; TweakAtZ: Alter Flow Rate" + else: + new_flowrate_1 = "" + + # For single extruder + if self.extruder_count == 1: + lines = data[self.start_index].splitlines() + lines[0] += new_flowrate_0 + data[self.start_index] = "\n".join(lines) + "\n" + lines = data[self.end_index].splitlines() + lines[len(lines) - 2] += reset_flowrate_0 + data[self.end_index] = "\n".join(lines) + "\n" + + # For dual-extruders + elif self.extruder_count > 1: + for index, layer in enumerate(data): + if index < self.start_index: + continue + else: + lines = layer.splitlines() + for l_index, line in enumerate(lines): + if line.startswith("T0"): + lines[l_index] += new_flowrate_0 + " T0" + if line.startswith("T1"): + lines[l_index] += new_flowrate_1 + " T1" + data[index] = "\n".join(lines) + "\n" + if index == self.end_index: + lines = data[index].splitlines() + lines[len(lines) - 2] += "\nM221 S100 ; TweakAtZ: Reset Flow Rate" + data[index] = "\n".join(lines) + "\n" + break + if index > self.end_index: + break + return data + + def _change_bed_temp(self, data:str)->str: + """ + Change the Bed Temperature at height or layer + :params: + new_bed_temp: The new temperature from the settings for this script + """ + if not self.heated_bed: + return data + new_bed_temp = self.getSettingValueByKey("d_bedTemp") + if self.start_index == 2: + if "M140 S" in data[2]: + data[2] = re.sub("M140 S", ";M140 S", data[2]) + if "M140 S" in data[3]: + data[3] = re.sub("M140 S", ";M140 S", data[3]) + lines = data[self.start_index].splitlines() + lines[0] += "\nM140 S" + str(new_bed_temp) + " ; TweakAtZ: Change Bed Temperature" + data[self.start_index] = "\n".join(lines) + "\n" + lines = data[self.end_index].splitlines() + lines[len(lines) - 2] += "\nM140 S" + str(self.orig_bed_temp) + " ; TweakAtZ: Reset Bed Temperature" + data[self.end_index] = "\n".join(lines) + "\n" + return data + + def _change_bv_temp(self, data:str)->str: + """ + Change the Build Volume temperature at height or layer + :param: + new_bv_temp: The new temperature from the settings for this script + """ + if not self.heated_build_volume: + return data + new_bv_temp = self.getSettingValueByKey("e_build_volume_temperature") + lines = data[self.start_index].splitlines() + lines[0] += "\nM141 S" + str(new_bv_temp) + " ; TweakAtZ: Change Build Volume Temperature" + data[self.start_index] = "\n".join(lines) + "\n" + lines = data[self.end_index].splitlines() + lines[len(lines) - 2] += "\nM141 S" + str(self.orig_bv_temp) + " ; TweakAtZ: Reset Build Volume Temperature" + data[self.end_index] = "\n".join(lines) + "\n" + return data + + def _change_hotend_temp(self, data:str)->str: + """ + Changes to the hot end temperature(s). + :params: + extruders_share_heater: Lets the script know how to handle the differences + active_tool: Tracks the active tool through the gcode + new_hotend_temp_0: The new temperature for the primary extruder T0 + orig_hot_end_temp_0: The print temperature for the primary extruder T0 as set in Cura + orig_standby_temp_0: The standby temperature for the primary extruder T0 from Cura. This marks a temperature line to ignore. + new_hotend_temp_1: The new temperature for the secondary extruder T1 + orig_hot_end_temp_1: The print temperature for the secondary extruder T1 as set in Cura + orig_standby_temp_1: The standby temperature for the secondary extruder T1 from Cura. This marks a temperature line to ignore. + """ + extruders_share_heater = bool(self.global_stack.getProperty("machine_extruders_share_heater", "value")) + self.active_tool = "T0" + self.new_hotend_temp_0 = self.getSettingValueByKey("f_extruder_temperature_t0") + self.orig_hot_end_temp_0 = int(self.extruder_list[0].getProperty("material_print_temperature", "value")) + self.orig_standby_temp_0 = int(self.extruder_list[0].getProperty("material_standby_temperature", "value")) + + # Start with single extruder machines + if self.extruder_count == 1: + if self.start_index == 2: + if "M104 S" in data[2]: + data[2] = re.sub("M104 S", ";M104 S", data[2]) + if "M104 S" in data[3]: + data[3] = re.sub("M104 S", ";M104 S", data[3]) + + # Add the temperature change at the beginning of the start layer + lines = data[self.start_index].splitlines() + for index, line in enumerate(lines): + lines[0] += "\n" + "M104 S" + str(self.new_hotend_temp_0) + " ; TweakAtZ: Change Nozzle Temperature" + data[self.start_index] = "\n".join(lines) + "\n" + break + + # Revert the temperature to the Cura setting at the end of the end layer + lines = data[self.end_index].splitlines() + for index, line in enumerate(lines): + lines[len(lines) - 2] += "\n" + "M104 S" + str(self.orig_hot_end_temp_0) + " ; TweakAtZ: Reset Nozzle Temperature" + data[self.end_index] = "\n".join(lines) + "\n" + break + + # Multi-extruder machines + elif self.extruder_count > 1: + self.new_hotend_temp_1 = self.getSettingValueByKey("f_extruder_temperature_t1") + self.orig_hot_end_temp_1 = int(self.extruder_list[1].getProperty("material_print_temperature", "value")) + self.orig_standby_temp_1 = int(self.extruder_list[1].getProperty("material_standby_temperature", "value")) + + # Track the tool number up to the start of the start layer + self.getTool("T0") + for index, layer in enumerate(data): + lines = layer.split("\n") + for line in lines: + if line.startswith("T"): + self.getTool(line) + if index == self.start_index - 1: + break + + # Add the active extruder initial temperature change at the start of the starting layer + data[self.start_index] = data[self.start_index].replace("\n", f"\nM104 S{self.active_print_temp} ; TweakAtZ: Start Temperature Change\n",1) + + # At the start layer commence making the changes + for index, layer in enumerate(data): + if index < self.start_index: + continue + if index > self.end_index: + break + lines = layer.splitlines() + for l_index, line in enumerate(lines): + + # Continue to track the tool number + if line.startswith("T"): + self.getTool(line) + if line.startswith("M109"): + lines[l_index] = f"M109 S{self.active_print_temp} ; TweakAtZ: Alter temperature" + elif line.startswith("M104"): + if self.getValue(line, "S") == self.inactive_standby_temp: + continue + elif self.getValue(line, "S") == self.inactive_tool_orig_temp: + lines[l_index] = re.sub("S(\d+|\d.+)", f"S{self.inactive_print_temp} ; TweakAtZ: Alter temperature", line) + elif self.getValue(line, "S") == self.active_tool_orig_temp: + lines[l_index] = re.sub("S(\d+|\d.+)", f"S{self.active_print_temp} ; TweakAtZ: Alter temperature", line) + data[index] = "\n".join(lines) + "\n" + + # Revert the active extruder temperature at the end of the changes + lines = data[self.end_index].split("\n") + lines[len(lines) - 3] += f"\nM104 {self.active_tool} S{self.active_tool_orig_temp} ; TweakAtZ: Original Temperature active tool" + data[self.end_index] = "\n".join(lines) + return data + + def getTool(self, line): + if line.startswith("T1"): + self.active_tool = "T1" + self.active_tool_orig_temp = self.orig_hot_end_temp_1 + self.active_print_temp = self.new_hotend_temp_1 + self.inactive_tool = "T0" + self.inactive_tool_orig_temp = self.orig_hot_end_temp_0 + self.inactive_print_temp = self.new_hotend_temp_0 + self.inactive_standby_temp = self.orig_standby_temp_0 + else: + self.active_tool = "T0" + self.active_tool_orig_temp = self.orig_hot_end_temp_0 + self.active_print_temp = self.new_hotend_temp_0 + self.inactive_tool = "T1" + self.inactive_tool_orig_temp = self.orig_hot_end_temp_1 + self.inactive_print_temp = self.new_hotend_temp_1 + self.inactive_standby_temp = self.orig_standby_temp_1 + return + + def _change_retract(self, data:str)->str: + """ + This is for single extruder printers only (tool change retractions get in the way for multi-extruders). + Depending on the selected options, this will change the Retraction Speeds and Prime Speeds, and the Retraction Distance. NOTE: The retraction and prime speeds will be the same. + :params: + speed_retract_0: The set retraction and prime speed from Cura. + retract_amt_0: The set retraction distance from Cura + change_retract_amt: Boolean to trip changing the retraction distance + change_retract_speed: Boolean to trip changing the speeds + new_retract_amt: The new retraction amount to use from this script settings. + new_retract_speed: The new retract and prime speed from this script settings. + firmware_start_str: The string to insert for changes to firmware retraction + firmware_reset: The last insertion for firmware retraction will set the numbers back to the settings in Cura. + is_retracted: Tracks the end of the filament location + cur_e: The current location of the extruder + prev_e: The location of where the extruder was before the current e + """ + if not self.retract_enabled: + return + + # Exit if neither child setting is checked. + if not (change_retract_amt or change_retract_speed): + return + + speed_retract_0 = int(self.extruder_list[0].getProperty("retraction_speed", "value") * 60) + retract_amt_0 = self.extruder_list[0].getProperty("retraction_amount", "value") + change_retract_amt = self.getSettingValueByKey("g_change_retract_amount") + change_retract_speed = self.getSettingValueByKey("g_change_retract_speed") + new_retract_speed = int(self.getSettingValueByKey("g_retract_speed") * 60) + new_retract_amt = self.getSettingValueByKey("g_retract_amount") + + # Use M207 and M208 to adjust firmware retraction when required + if self.firmware_retraction: + lines = data[self.start_index].splitlines() + firmware_start_str = "\nM207" + firmware_reset = "" + if change_retract_speed: + firmware_start_str += f" F{new_retract_speed}" + if change_retract_amt: + firmware_start_str += f" S{new_retract_amt}" + if change_retract_speed or change_retract_amt: + firmware_start_str += " ; TweakAtZ: Alter Firmware Retract speed/amt" + if change_retract_speed: + firmware_start_str += f"\nM208 F{new_retract_speed} ; TweakAtZ: Alter Firmware Prime speed" + lines[0] += firmware_start_str + data[self.start_index] = "\n".join(lines) + "\n" + lines = data[self.end_index].splitlines() + firmware_reset = f"M207 F{speed_retract_0} S{retract_amt_0} ; TweakAtZ: Reset Firmware Retract" + if change_retract_speed: + firmware_reset += f"\nM208 S{speed_retract_0} ; TweakAtZ: Reset Firmware Prime" + if len(lines) < 2: + lines.append(firmware_reset) + else: + lines[len(lines) - 2] += "\n" + firmware_reset + data[self.end_index] = "\n".join(lines) + "\n" + return data + + if not self.firmware_retraction: + prev_e = 0 + cur_e = 0 + is_retracted = False + for num in range(1, self.start_index - 1): + lines = data[num].splitlines() + for line in lines: + if " E" in line: + cur_e = self.getValue(line, "E") + prev_e = cur_e + for num in range(self.start_index, self.end_index): + lines = data[num].splitlines() + for index, line in enumerate(lines): + if line == "G92 E0": + cur_e = 0 + prev_e = 0 + continue + if " E" in line and self.getValue(line, "E") is not None: + cur_e = self.getValue(line, "E") + if cur_e >= prev_e and " X" in line and " Y" in line: + prev_e = cur_e + is_retracted = False + continue + if " F" in line and " E" in line and not " X" in line and not " Z" in line: + cur_speed = self.getValue(line, "F") + if cur_e < prev_e: + is_retracted = True + new_e = prev_e - new_retract_amt + if not self.relative_extrusion: + if change_retract_amt: + lines[index] = lines[index].replace("E" + str(cur_e), "E" + str(new_e)) + prev_e = new_e + if change_retract_speed: + lines[index] = lines[index].replace("F" + str(cur_speed), "F" + str(new_retract_speed)) + elif self.relative_extrusion: + if change_retract_amt: + lines[index] = lines[index].replace("E" + str(cur_e), "E-" + str(new_retract_amt)) + prev_e = 0 + if change_retract_speed: + lines[index] = lines[index].replace("F" + str(cur_speed), "F" + str(new_retract_speed)) + lines[index] += " ; TweakAtZ: Alter retract" + else: + + # Prime line + if change_retract_speed: + lines[index] = lines[index].replace("F" + str(cur_speed), "F" + str(new_retract_speed)) + prev_e = cur_e + if self.relative_extrusion: + if change_retract_amt: + lines[index] = lines[index].replace("E" + str(cur_e), "E" + str(new_retract_amt)) + prev_e = 0 + lines[index] += " ; TweakAtZ: Alter retract" + is_retracted = False + data[num] = "\n".join(lines) + "\n" + + # If the changes end before the last layer and the filament is retracted, then adjust the first prime of the next layer so it doesn't blob. + if is_retracted and self.getSettingValueByKey("a_end_layer") != -1: + layer = data[self.end_index] + lines = layer.splitlines() + for index, line in enumerate(lines): + if " X" in line and " Y" in line and " E" in line: + break + if " F" in line and " E" in line and not " X" in line and not " Z" in line: + cur_e = self.getValue(line, "E") + if not self.relative_extrusion: + new_e = prev_e + new_retract_amt + if change_retract_amt: + lines[index] = lines[index].replace("E" + str(cur_e), "E" + str(new_e)) + " ; TweakAtZ: Alter retract" + break + elif self.relative_extrusion: + if change_retract_amt: + lines[index] = lines[index].replace("E" + str(cur_e), "E" + str(new_retract_amt)) + " ; TweakAtZ: Alter retract" + break + data[self.end_index] = "\n".join(lines) + "\n" + return data + + def _format_lines(self, temp_data: str) -> str: + """ + This adds '-' as padding so the setting descriptions are more readable in the gcode + """ + for l_index, layer in enumerate(temp_data): + lines = layer.split("\n") + for index, line in enumerate(lines): + if "; TweakAtZ:" in line: + lines[index] = lines[index].split(";")[0] + ";" + ("-" * (40 - len(lines[index].split(";")[0]))) + lines[index].split(";")[1] + temp_data[l_index] = "\n".join(lines) + return temp_data + + def _change_bv_fan_speed(self, temp_data: str) -> str: + """ + This can be used to control any fan. Typically this would be an Auxilliary or Build Volume fan + :params: + bv_fan_nr: The 'P' number of the fan + bv_fan_speed: The new speed for the fan + orig_bv_fan_speed: The reset speed. This is currently always "0" as the fan speed may not exist in Cura, or the fan might be 'on-off' and not PWM controlled. + """ + if not self.getSettingValueByKey("enable_bv_fan_change"): + return temp_data + bv_fan_nr = self.getSettingValueByKey("bv_fan_nr") + bv_fan_speed = self.getSettingValueByKey("e1_build_volume_fan_speed") + orig_bv_fan_speed = 0 + if bool(self.extruder_list[0].getProperty("machine_scale_fan_speed_zero_to_one", "value")): + bv_fan_speed = round(bv_fan_speed * 0.01, 2) + orig_bv_fan_speed = round(orig_bv_fan_speed * 0.01, 2) + else: + bv_fan_speed = round(bv_fan_speed * 2.55) + orig_bv_fan_speed = round(orig_bv_fan_speed * 2.55) + + # Add the changes to the gcode + for index, layer in enumerate(temp_data): + if index == self.start_index: + lines = layer.split("\n") + lines.insert(1, f"M106 S{bv_fan_speed} P{bv_fan_nr} ; TweakAtZ: Change Build Volume Fan Speed") + temp_data[index] = "\n".join(lines) + if index == self.end_index: + lines = layer.split("\n") + lines.insert(len(lines) - 2, f"M106 S{orig_bv_fan_speed} P{bv_fan_nr} ; TweakAtZ: Reset Build Volume Fan Speed") + temp_data[index] = "\n".join(lines) + return temp_data + + # Get the starting index or ending index of the change range when 'By Height' + def _is_legal_z(self, data: str, the_height: float) -> int: + """ + When in 'By Height' mode, this will return the index of the layer where the working Z is >= the Starting Z height, or the index of the layer where the working Z >= the Ending Z height + :params: + max_z: The maximum Z height within the Gcode. This is used to determine the upper limit of the data list that should be returned. + the_height: The user input height. This will be adjusted if rafts are enabled and/or Z-hops are enabled + cur_z: Is the current Z height as tracked through the gcode + the_index: The number to return. + """ + # The height passed down cannot exceed the height of the model or the search for the Z fails + lines = data[0].split("\n") + for line in lines: + if "MAXZ" in line or "MAX.Z" in line: + max_z = float(line.split(":")[1]) + break + if the_height > max_z: + the_height = max_z + + starting_z = 0 + the_index = 0 + + # The start height varies depending whether or not rafts are enabled and whether Z-hops are enabled. + if str(self.global_stack.getProperty("adhesion_type", "value")) == "raft": + + # If z-hops are enabled then start looking for the working Z after layer:0 + if self.z_hop_enabled: + for layer in data: + if ";LAYER:0" in layer: + lines = layer.splitlines() + for index, line in enumerate(lines): + try: + if " Z" in line and " E" in lines[index + 1]: + starting_z = round(float(self.getValue(line, "Z")),2) + the_height += starting_z + break + + # If the layer ends without an extruder move following the Z line, then just jump out + except IndexError: + starting_z = round(float(self.getValue(line, "Z")),2) + the_height += starting_z + break + + # If Z-hops are disabled, then look for the starting Z from the start of the raft up to Layer:0 + else: + for layer in data: + lines = layer.splitlines() + for index, line in enumerate(lines): + + # This try/except catches comments in the startup gcode + try: + if " Z" in line and " E" in lines[index - 1]: + starting_z = float(self.getValue(line, "Z")) + except TypeError: + + # Just pass beause there will be further Z values + pass + if ";LAYER:0" in line: + the_height += starting_z + break + + # Initialize 'cur_z' + cur_z = self.initial_layer_height + for index, layer in enumerate(data): + + # Skip over the opening paragraph and StartUp Gcode + if index < 2: + continue + lines = layer.splitlines() + for z_index, line in enumerate(lines): + if len(line) >= 3 and line[0:3] in ['G0 ', 'G1 ', 'G2 ', 'G3 '] and index <= self.end_index: + if " Z" in line: + cur_z = float(self.getValue(line, "Z")) + if cur_z >= the_height and lines[z_index - 1].startswith(";TYPE:"): + the_index = index + break + if the_index > 0: + break + + # Catch-all to insure an entry of the 'model_height'. This allows the changes to continue to the end of the top layer + if the_height >= max_z: + the_index = len(data) - 2 + return the_index + + def _f_x_y_not_z(self, line): + return " F" in line and " X" in line and " Y" in line and not " Z" in line diff --git a/plugins/PostProcessingPlugin/scripts/ZHopOnTravel.py b/plugins/PostProcessingPlugin/scripts/ZHopOnTravel.py new file mode 100644 index 0000000000..69cf3d1938 --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/ZHopOnTravel.py @@ -0,0 +1,564 @@ +""" + By GregValiant (Greg Foresi) July of 2024 + Insert Z-hops for travel moves regardless of retraction. The 'Layer Range' (or comma delimited 'Layer List'), 'Minimum Travel Distance' and the 'Hop-Height' are user defined. + This script is compatible with Z-hops enabled in Cura. If Z-hops are enabled: There will occasionally be a hop on top of a hop, but the 'resume Z height' will be correct. + It is not necessary to have "retractions" enabled. If retractions are disabled in Cura you may elect to have this script add retractions. The Cura retraction distance and speeds are used. + + Compatibility: + Multi-Extruder printers: NOTE - The retraction settings for a multi-extruder printer are always taken from Extruder 1 (T0). + There is support for: + Absolute and Relative Extrusion + Firmware Retraction + Extra Prime Amount > 0 + Adaptive Layers + G2/G3 arc moves are supported but are treated as straight line moves. + + Incompatibility: + "One at a Time" mode is not supported + + Please Note: + This is a slow running post processor as it must check the cumulative distances of all travel moves (G0 moves) in the range of layers. +""" + +from UM.Application import Application +from ..Script import Script +import re +from UM.Message import Message +import math +from UM.Logger import Logger + +class ZHopOnTravel(Script): + def __init__(self): + super().__init__() + + def getSettingDataString(self): + return """{ + "name": "Z-Hop on Travel", + "key": "ZHopOnTravel", + "metadata": {}, + "version": 2, + "settings": { + "zhop_travel_enabled": { + "label": "Enable script", + "description": "Enables the script so it will run. 'One-at-a-Time' is not supported. This script is slow running because it must check the length of all travel moves in your layer range. ", + "type": "bool", + "default_value": true, + "enabled": true + }, + "list_or_range": + { + "label": "Layer List or Range", + "description": "Using a list allows you to call out one or more individual layers delimited by commas (Ex: 23,29,35). A layer range has a start layer and an end layer.", + "type": "enum", + "options": { + "range_of_layers": "Range of Layers", + "list_of_layers": "Layer List" }, + "default_value": "range_of_layers", + "enabled": "zhop_travel_enabled" + }, + "layers_of_interest": + { + "label": "List of Layers", + "description": "Use the Cura preview layer numbers. Enter 'individual layer' numbers delimited by commas. Spaces are not allowed.", + "type": "str", + "default_value": "10,28,31,54", + "enabled": "zhop_travel_enabled and list_or_range == 'list_of_layers'" + }, + "start_layer": { + "label": "Start Layer", + "description": "Layer number to start the changes at. Use the Cura preview layer numbers. The changes will start at the start of the layer.", + "unit": "Lay# ", + "type": "int", + "default_value": 1, + "minimum_value": 1, + "enabled": "zhop_travel_enabled and list_or_range == 'range_of_layers'" + }, + "end_layer": { + "label": "End Layer", + "description": "Enter '-1' to indicate the top layer, or enter a specific Layer number from the Cura preview. The changes will end at the end of this layer.", + "unit": "Lay# ", + "type": "int", + "default_value": -1, + "minimum_value": -1, + "enabled": "zhop_travel_enabled and list_or_range == 'range_of_layers'" + }, + "hop_height": { + "label": "Z-Hop Height", + "description": "The relative 'Height' that the nozzle will 'Hop' in the 'Z'.", + "unit": "mm ", + "type": "float", + "default_value": 0.5, + "minimum_value": 0, + "maximum_value_warning": 5, + "maximum_value": 10, + "enabled": "zhop_travel_enabled" + }, + "min_travel_dist": { + "label": "Minimum Travel Distance", + "description": "Travel distances longer than this will cause a Z-Hop to occur.", + "unit": "mm ", + "type": "int", + "default_value": 10, + "minimum_value": 1, + "maximum_value": 200, + "enabled": "zhop_travel_enabled" + }, + "add_retract": { + "label": "Add retraction when necessary", + "description": "Depending on your travel settings there may not be a retraction prior to a travel move. When enabled, if there is no retraction prior to an added z-hop, this setting will add a retraction before the Z-hop, and a prime after returning to the working layer height. If retractions are disabled in Cura this setting is still available and will add retractions based on the Cura settings for Retraction Amount and Retract and Prime Speeds. All retraction settings are from the settings for 'Extruder 1' regardless of the number of extruders.", + "type": "bool", + "default_value": false, + "enabled": "zhop_travel_enabled" + }, + "infill_only": { + "label": "Add Z-hops to Infill Only", + "description": "Only add Z-hops to 'Infill' within the layer range. (NOTE: For technical reasons it is not possible to add Z-hops to travel moves that start somewhere and just 'cross infill'.)", + "type": "bool", + "default_value": false, + "enabled": "zhop_travel_enabled" + } + } + }""" + + def execute(self, data): + """ + The script will parse the gcode and check the cumulative length of travel moves. When they exceed the "min_travel_dist" then hop-ups are added before the travel and at the end of the travel. The user may select to add retractions/primes if there were none. + params: + layer_list: The list of 'layers-of-interest' for both 'Layer Range' and a 'Layer List'. + index_list: A list of the indexes within the data[] for the layers-of-interest. + self._cur_z: The variable used to track the working Z-height through the gcode + self._add_retract: User setting of whether to insure a retraction at inserted Z-hops + self._is_retracted: Whether a retraction has occurred prior to the added Z-hop + min_travel_dist: The user setting for the minimum distance of travel for Z-hops to be inserted + start_index: The index (in data[]) of the first layer-of-interest. The Z-hops start at the beginning of this layer. + end_index: The index (in data[]) of the last layer-of-interest. The Z-hops end at the end of this layer. + hop_up_lines: The string to insert for 'Hop up' + hop_down_lines: The string to insert for 'Hop down' + hop_start: The index within a layer where a 'Hop up' is inserted + hop_end: The index within a layer where a 'Hop down' is inserted + extra_prime_dist: Is calculated from the Cura extra_prime_volume and if > 0 is used to reset the E location prior to unretracting. + """ + + # Exit if the script is not enabled + if not self.getSettingValueByKey("zhop_travel_enabled"): + data[0] += "; [Z-Hop on Travel] Not enabled\n" + Logger.log("i", "[Z-Hop on Travel] Not enabled") + return data + + # Exit if the gcode has already been post-processed + if ";POSTPROCESSED" in data[0]: + return data + + # Define the global_stack to access the Cura settings + global_stack = Application.getInstance().getGlobalContainerStack() + + # Exit if the Print Sequence is One-at-a-Time + if global_stack.getProperty("print_sequence", "value") == "one_at_a_time": + Message(title = "[ZHop On Travel]", text = "Is not compatible with 'One at a Time' print sequence.").show() + data[0] += "; [ZHop On Travel] did not run because One at a Time is enabled" + return data + + # Define some variables + extruder = global_stack.extruderList + speed_zhop = extruder[0].getProperty("speed_z_hop", "value") * 60 + speed_travel = extruder[0].getProperty("speed_travel", "value") * 60 + retraction_enabled = extruder[0].getProperty("retraction_enable", "value") + retraction_amount = extruder[0].getProperty("retraction_amount", "value") + retract_speed = int(extruder[0].getProperty("retraction_retract_speed", "value")) * 60 + prime_speed = int(extruder[0].getProperty("retraction_prime_speed", "value")) * 60 + firmware_retract = global_stack.getProperty("machine_firmware_retract", "value") + relative_extrusion = global_stack.getProperty("relative_extrusion", "value") + self._cur_z = float(global_stack.getProperty("layer_height_0", "value")) + filament_dia = extruder[0].getProperty("material_diameter", "value") + extra_prime_vol = extruder[0].getProperty("retraction_extra_prime_amount", "value") + extra_prime_dist = extra_prime_vol / (math.pi * (filament_dia / 2)**2) + self._add_retract = self.getSettingValueByKey("add_retract") + hop_height = round(self.getSettingValueByKey("hop_height"),2) + list_or_range = self.getSettingValueByKey("list_or_range") + infill_only = self.getSettingValueByKey("infill_only") + layer_list = [] + index_list = [] + + # Get either the 'range_of_layers' or the 'list_of_layers' and convert them to 'layer_list' and then 'index_list' + if list_or_range == "list_of_layers": + layer_string = self.getSettingValueByKey("layers_of_interest") + layer_list = layer_string.split(",") + layer_list.sort() + for layer in layer_list: + for num in range(2, len(data) - 1): + if ";LAYER:" + str(int(layer) - 1) + "\n" in data[num]: + index_list.append(num) + start_index = index_list[0] + + elif list_or_range == "range_of_layers": + start_layer = self.getSettingValueByKey("start_layer") + end_layer = self.getSettingValueByKey("end_layer") + end_index = None + # Get the indexes for the start and end layers + start_index = 2 + for num in range(1, len(data) - 1): + if ";LAYER:" + str(start_layer - 1) + "\n" in data[num]: + start_index = num + break + if end_layer == -1: + if retraction_enabled: + end_index = len(data) - 3 + else: + end_index = len(data) - 2 + elif end_layer != -1: + for num in range(1, len(data) - 1): + if ";LAYER:" + str(end_layer) + "\n" in data[num]: + end_layer = data[num].splitlines()[0].split(":")[1] + end_index = num + break + if end_index is None: + end_index = len(data)-1 + for num in range(start_index, end_index): + index_list.append(num) + + # Track the Z up to the starting layer + for num in range(1, start_index): + lines = data[num].splitlines() + for line in lines: + if " Z" in line and self.getValue(line, "Z"): + self._cur_z = self.getValue(line, "Z") + + # Use 'start_here' to avoid a zhop on the first move of the initial layer because a double-retraction may occur. + if start_index == 2: + start_here = False + else: + start_here = True + + # Initialize variables + self._is_retracted = False + hop_up_lines = "" + hop_down_lines = "" + hop_start = 0 + hop_end = 0 + self._cur_x = 0.0 + self._cur_y = 0.0 + self._prev_x = 0.0 + self._prev_y = 0.0 + self._cur_e = 0.0 + self._prev_e = 0.0 + cmd_list = ["G0 ", "G1 ", "G2 ", "G3 "] + self.reset_type = 0 + + # Keep track of the axes locations if the start layer > layer:0 + if start_index > 2: + self._track_all_axes(data, cmd_list, start_index, relative_extrusion) + + # Make the insertions + in_the_infill = False + for num in range(start_index, len(data)-1): + # Leave if the num > highest index number to speed up the script. + if num > index_list[len(index_list)-1]: + break + # If the num is not an "index of interest" then just track the Z through the layer + if num not in index_list: + lines = data[num].splitlines() + for line in lines: + if " Z" in line and self.getValue(line, "Z"): + self._cur_z = self.getValue(line, "Z") + continue + # If the num is in the index_list then make changes + elif num in index_list: + lines = data[num].splitlines() + for index, line in enumerate(lines): + if num == 2: + if line.startswith(";TYPE"): + start_here = True + if line.startswith(";") and in_the_infill == True: + in_the_infill = False + if line.startswith(";TYPE:FILL"): + in_the_infill = True + if line.startswith("G92") and " E" in line: + self._cur_e = self.getValue(line, "E") + self._prev_e = self._cur_e + continue + # Get the XYZ values from movement commands + if line[0:3] in cmd_list: + if " X" in line and self.getValue(line, "X"): + self._prev_x = self._cur_x + self._cur_x = self.getValue(line, "X") + if " Y" in line and self.getValue(line, "Y"): + self._prev_y = self._cur_y + self._cur_y = self.getValue(line, "Y") + if " Z" in line and self.getValue(line, "Z"): + self._cur_z = self.getValue(line, "Z") + + # Check whether retractions have occured + if line[0:3] in ["G1 ", "G2 ", "G3 "] and "X" in line and "Y" in line and "E" in line: + self._is_retracted = False + self._cur_e = self.getValue(line, "E") + elif (line.startswith("G1") and "F" in line and "E" in line and (not "X" in line or not "Y" in line)) or "G10" in line: + if self.getValue(line, "E"): + self._cur_e = self.getValue(line, "E") + if not relative_extrusion: + if self._cur_e < self._prev_e or "G10" in line: + self._is_retracted = True + elif relative_extrusion: + if self._cur_e < 0 or "G10" in line: + self._is_retracted = True + if line.startswith(";TYPE"): + start_here = True + if not start_here: + continue + + # All travels are checked for their cumulative length + if line.startswith("G0 ") and hop_start == 0: + hop_indexes = self._total_travel_length(index, lines) + hop_start = int(hop_indexes[0]) + hop_end = int(hop_indexes[1]) + if infill_only and not in_the_infill: + hop_start = 0 + hop_end = 0 + if hop_start > 0: + # For any lines that are XYZ moves right before layer change + if " Z" in line: + lines[index] = lines[index].replace("Z" + str(self._cur_z), "Z" + str(self._cur_z + hop_height)) + # If there is no 'F' in the next line then add one at the Travel Speed so the z-hop speed doesn't carry over + if not " F" in lines[index] and lines[index].startswith("G0"): + lines[index] = lines[index].replace("G0", f"G0 F{speed_travel}") + if "X" in lines[index - 1] and "Y" in lines[index - 1] and "E" in lines[index - 1]: + self._is_retracted = False + hop_up_lines = self.get_hop_up_lines(retraction_amount, speed_zhop, retract_speed, extra_prime_dist, firmware_retract, relative_extrusion, hop_height) + lines[index] = hop_up_lines + lines[index] + + # Make the 'Zhop down' insertion at the correct index location (or as soon as practicable after it) + if hop_end > 0 and index >= hop_end: + # If there is no 'F' in the next line then add one to reinstate the Travel Speed (so the z-hop speed doesn't carry over through the travel moves) + if not " F" in lines[index] and lines[index].startswith("G0"): + lines[index] = lines[index].replace("G0", f"G0 F{speed_travel}") + hop_down_lines = self.get_hop_down_lines(retraction_amount, speed_zhop, prime_speed, extra_prime_dist, firmware_retract, relative_extrusion, lines[index]) + lines[index] = hop_down_lines + lines[index] + self._is_retracted = False + hop_end = 0 + hop_start = 0 + hop_down_lines = "" + if line.startswith(";"): + continue + self._prev_e = self._cur_e + data[num] = "\n".join(lines) + "\n" + + # Message to the user informing them of the number of Z-hops and retractions added + hop_cnt = 0 + retract_cnt = 0 + try: + for index_nr in index_list: + hop_cnt += data[index_nr].count("; Hop Up") + retract_cnt += data[index_nr].count("; Retract") + msg_txt = str(hop_cnt) + " Z-Hops were added to the file\n" + if self._add_retract: + msg_txt += str(retract_cnt) + " Retracts and unretracts were added to the file" + Message(title = "[Z-hop On Travel]", text = msg_txt).show() + except: + pass + return data + + def _total_travel_length(self, l_index: int, lines: str) -> int: + """ + This function gets the cumulative total travel distance of each individual travel move. + :parameters: + g_num: is the line index as passed from the calling function and when returned indicates the end of travel + travel_total: is the cumulative travel distance + """ + g_num = l_index + travel_total = 0.0 + # Total the lengths of each move and compare them to the Minimum Distance for a Z-hop to occur + while lines[g_num].startswith("G0 "): + travel_total += self._get_distance() + self._prev_x = self._cur_x + if self.getValue(lines[g_num], "X"): + self._cur_x = self.getValue(lines[g_num], "X") + self._prev_y = self._cur_y + if self.getValue(lines[g_num], "Y"): + self._cur_y = self.getValue(lines[g_num], "Y") + g_num += 1 + if g_num == len(lines): + break + if travel_total > self.getSettingValueByKey("min_travel_dist"): + return [l_index, g_num] + else: + return [0, 0] + + def _get_distance(self) -> float: + """ + This function gets the distance from the previous location to the current location. + """ + try: + dist = math.sqrt((self._prev_x - self._cur_x)**2 + (self._prev_y - self._cur_y)**2) + except ValueError: + return 0 + return dist + + def get_hop_up_lines(self, retraction_amount: float, speed_zhop: str, retract_speed: str, extra_prime_dist: float, firmware_retract: bool, relative_extrusion: bool, hop_height: str) -> str: + """ + Determine if the hop will require a retraction + :parameters: + reset_type: An indicator to handle differences when Firmware Retraction, and Relative Extrusion, and Extra Prime are enabled + up_lines: The inserted line(s) for the Z-hop Up + front_text and back_text: Are the line splits to account for existing gcode lines that have comments in them + """ + hop_retraction = not self._is_retracted + if not self._add_retract: + hop_retraction = False + # 'reset_type' is a bitmask representing the combination of retraction and related options: + # Bit 0 (1): Retraction is required + # Bit 1 (2): Firmware retraction is enabled + # Bit 2 (4): Relative extrusion is enabled + # Bit 3 (8): Extra prime amount is greater than 0 + # The value of 'reset_type' determines which G-code lines are inserted for the Z-hop. + reset_type = 0 + if hop_retraction: + reset_type += 1 + if firmware_retract and hop_retraction: + reset_type += 2 + if relative_extrusion and hop_retraction: + reset_type += 4 + if extra_prime_dist > 0 and hop_retraction: + reset_type += 8 + + machine_height = Application.getInstance().getGlobalContainerStack().getProperty("machine_height", "value") + if self._cur_z + hop_height < machine_height: + up_lines = f"G1 F{speed_zhop} Z{round(self._cur_z + hop_height,2)} ; Hop Up" + else: + up_lines = f"G1 F{speed_zhop} Z{round(machine_height, 2)} ; Hop Up" + if reset_type in [1, 9] and hop_retraction: # add retract only when necessary + up_lines = f"G1 F{retract_speed} E{round(self._cur_e - retraction_amount, 5)} ; Retract\n" + up_lines + self._cur_e = round(self._cur_e - retraction_amount, 5) + if reset_type in [3, 7, 11, 15] and hop_retraction: # add retract and firmware retract + up_lines = "G10 ; Retract\n" + up_lines + if reset_type in [5, 13] and hop_retraction: # add retract and relative extrusion + up_lines = f"G1 F{retract_speed} E-{retraction_amount} ; Retract\n" + up_lines + self._cur_e = 0 + + # Format the added lines for readability + if "\n" in up_lines: # for lines that include a retraction + lines = up_lines.split("\n") + for index, line in enumerate(lines): + front_txt = lines[index].split(";")[0] + back_txt = lines[index].split(";")[1] + lines[index] = front_txt + str(" " * (40 - len(front_txt))) +";" + back_txt + up_lines = "\n".join(lines) + "\n" + else: # for lines without a retraction + front_txt = up_lines.split(";")[0] + back_txt = up_lines.split(";")[1] + up_lines = front_txt + str(" " * (40 - len(front_txt))) +";" + back_txt + "\n" + return up_lines + + # The Zhop down may require different kinds of primes depending on the Cura settings. + def get_hop_down_lines(self, retraction_amount: float, speed_zhop: str, prime_speed: str, extra_prime_dist: str, firmware_retract: bool, relative_extrusion: bool, next_line: str) -> str: + """ + Determine if the hop will require a prime + :parameters: + reset_type: An indicator to handle differences when Firmware Retraction, and Relative Extrusion, and Extra Prime are enabled + dn_lines: The inserted line(s) for the Z-hop Down + front_text and back_text: Are the line splits to account for existing gcode lines that have comments in them + """ + hop_retraction = not self._is_retracted + if not self._add_retract: + hop_retraction = False + # Base the prime on the combination of Cura settings + reset_type = 0 + if hop_retraction: + reset_type += 1 + if firmware_retract and hop_retraction: + reset_type += 2 + if relative_extrusion and hop_retraction: + reset_type += 4 + if extra_prime_dist > 0.0 and hop_retraction: + reset_type += 8 + dn_lines = f"G1 F{speed_zhop} Z{self._cur_z} ; Hop Down" + # Format the line and return if the retraction option is unchecked + if "G11" in next_line or re.search("G1 F(\d+\.\d+|\d+) E(-?\d+\.\d+|-?\d+)", next_line) and reset_type == 0: + front_txt = dn_lines.split(";")[0] + back_txt = dn_lines.split(";")[1] + dn_lines = front_txt + str(" " * (40 - len(front_txt))) +";" + back_txt + "\n" + self._is_retracted = False + return dn_lines + # If the retraction option is checked then determine the required unretract code for the particular combination of Cura settings. + # Add retract 1 + if reset_type == 1 and hop_retraction: + dn_lines += f"\nG1 F{prime_speed} E{round(self._prev_e + retraction_amount, 5)} ; Unretract" + # Add retract 1 + firmware retract 2 and Add retract 1 + firmware retraction 2 + relative extrusion 4 + if reset_type in [3, 7] and hop_retraction: + dn_lines += "\nG11 ; UnRetract" + # Add retract 1 + relative extrusion 4 + if reset_type == 5 and hop_retraction: + dn_lines += f"\nG1 F{prime_speed} E{retraction_amount} ; UnRetract" + # Add retract 1 + extra prime 8 + if reset_type == 9 and hop_retraction: + dn_lines += f"\nG92 E{round(self._prev_e - extra_prime_dist,5)} ; Extra prime adjustment" + dn_lines += f"\nG1 F{prime_speed} E{round(self._prev_e + retraction_amount, 5)} ; UnRetract" + self._cur_e = round(self._prev_e + retraction_amount, 5) + # Add retract 1 + firmware retraction 2 + extra prime 8 + if reset_type == 11 and hop_retraction: + dn_lines += "\nG11 ; UnRetract" + dn_lines += "\nM83 ; Relative extrusion" + dn_lines += f"\nG1 F{prime_speed} E{round(extra_prime_dist, 5)} ; Extra prime" + if not relative_extrusion: + dn_lines += "\nM82 ; Absolute extrusion" + # Add retract 1 + relative extrusion 4 + extra prime 8 + if reset_type == 13 and hop_retraction: + dn_lines += f"\nG1 F{prime_speed} E{round(retraction_amount + extra_prime_dist, 5)} ; Unretract with extra prime" + # Add retract 1 + firmware retraction 2 + relative extrusion 4 + extra prime 8 + if reset_type == 15 and hop_retraction: + dn_lines += "\nG11 ; UnRetract" + dn_lines += f"\nG1 F{prime_speed} E{round(extra_prime_dist, 5)} ; Extra prime" + + # Format the added lines for readability + if "\n" in dn_lines: # for lines with primes + lines = dn_lines.split("\n") + for index, line in enumerate(lines): + front_txt = lines[index].split(";")[0] + back_txt = lines[index].split(";")[1] + lines[index] = front_txt + str(" " * (40 - len(front_txt))) +";" + back_txt + dn_lines = "\n".join(lines) + "\n" + else: # for lines with no prime + front_txt = dn_lines.split(";")[0] + back_txt = dn_lines.split(";")[1] + dn_lines = front_txt + str(" " * (40 - len(front_txt))) +";" + back_txt + "\n" + self._is_retracted = False + return dn_lines + + def _track_all_axes(self, data: str, cmd_list: str, start_index: int, relative_extrusion: bool) -> str: + """ + This function tracks the XYZE locations prior to the beginning of the first 'layer-of-interest' + + """ + for num in range(2, start_index): + lines = data[num].split("\n") + for line in lines: + # Get the XYZ values from movement commands + if line[0:3] in cmd_list: + if " X" in line and self.getValue(line, "X"): + self._prev_x = self._cur_x + self._cur_x = self.getValue(line, "X") + if " Y" in line and self.getValue(line, "Y"): + self._prev_y = self._cur_y + self._cur_y = self.getValue(line, "Y") + if " Z" in line and self.getValue(line, "Z"): + self._cur_z = self.getValue(line, "Z") + + # Check whether retractions have occured and track the E location + if not relative_extrusion: + if line.startswith("G1 ") and " X" in line and " Y" in line and " E" in line: + self._is_retracted = False + self._cur_e = self.getValue(line, "E") + elif line.startswith("G1 ") and " F" in line and " E" in line and not " X" in line and not " Y" in line: + if self.getValue(line, "E"): + self._cur_e = self.getValue(line, "E") + elif line.startswith("G10"): + self._is_retracted = True + elif line.startswith("G11"): + self._is_retracted = False + elif relative_extrusion: + if self._cur_e < 0 or "G10" in line: + self._is_retracted = True + self._cur_e = 0 + if line.startswith("G11"): + self._is_retracted = False + self._cur_e = 0 + self._prev_e = self._cur_e + return None diff --git a/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py b/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py index fd8118306b..25617ce824 100644 --- a/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py +++ b/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py @@ -1,6 +1,11 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2025 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. +import hashlib import json +import platform +import re +import secrets +from enum import StrEnum from json import JSONDecodeError from typing import Callable, List, Optional, Dict, Union, Any, Type, cast, TypeVar, Tuple @@ -9,6 +14,8 @@ from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkRepl from UM.Logger import Logger +from cura.CuraApplication import CuraApplication + from ..Models.BaseModel import BaseModel from ..Models.Http.ClusterPrintJobStatus import ClusterPrintJobStatus from ..Models.Http.ClusterPrinterStatus import ClusterPrinterStatus @@ -20,6 +27,18 @@ ClusterApiClientModel = TypeVar("ClusterApiClientModel", bound=BaseModel) """The generic type variable used to document the methods below.""" +class HttpRequestMethod(StrEnum): + GET = "GET", + HEAD = "HEAD", + POST = "POST", + PUT = "PUT", + DELETE = "DELETE", + CONNECT = "CONNECT", + OPTIONS = "OPTIONS", + TRACE = "TRACE", + PATCH = "PATCH", + + class ClusterApiClient: """The ClusterApiClient is responsible for all network calls to local network clusters.""" @@ -27,6 +46,13 @@ class ClusterApiClient: PRINTER_API_PREFIX = "/api/v1" CLUSTER_API_PREFIX = "/cluster-api/v1" + AUTH_REALM = "Jedi-API" + AUTH_QOP = "auth" + AUTH_NONCE_LEN = 16 + AUTH_CNONCE_LEN = 8 + + AUTH_MAX_TRIES = 5 + # In order to avoid garbage collection we keep the callbacks in this list. _anti_gc_callbacks = [] # type: List[Callable[[], None]] @@ -40,6 +66,12 @@ class ClusterApiClient: self._manager = QNetworkAccessManager() self._address = address self._on_error = on_error + self._auth_id = None + self._auth_key = None + self._auth_tries = 0 + + self._nonce_count = 1 + self._nonce = None def getSystem(self, on_finished: Callable) -> None: """Get printer system information. @@ -47,7 +79,7 @@ class ClusterApiClient: :param on_finished: The callback in case the response is successful. """ url = "{}/system".format(self.PRINTER_API_PREFIX) - reply = self._manager.get(self._createEmptyRequest(url)) + reply = self._manager.get(self.createEmptyRequest(url)) self._addCallback(reply, on_finished, PrinterSystemStatus) def getMaterials(self, on_finished: Callable[[List[ClusterMaterial]], Any]) -> None: @@ -56,7 +88,7 @@ class ClusterApiClient: :param on_finished: The callback in case the response is successful. """ url = "{}/materials".format(self.CLUSTER_API_PREFIX) - reply = self._manager.get(self._createEmptyRequest(url)) + reply = self._manager.get(self.createEmptyRequest(url)) self._addCallback(reply, on_finished, ClusterMaterial) def getPrinters(self, on_finished: Callable[[List[ClusterPrinterStatus]], Any]) -> None: @@ -65,7 +97,7 @@ class ClusterApiClient: :param on_finished: The callback in case the response is successful. """ url = "{}/printers".format(self.CLUSTER_API_PREFIX) - reply = self._manager.get(self._createEmptyRequest(url)) + reply = self._manager.get(self.createEmptyRequest(url)) self._addCallback(reply, on_finished, ClusterPrinterStatus) def getPrintJobs(self, on_finished: Callable[[List[ClusterPrintJobStatus]], Any]) -> None: @@ -74,26 +106,26 @@ class ClusterApiClient: :param on_finished: The callback in case the response is successful. """ url = "{}/print_jobs".format(self.CLUSTER_API_PREFIX) - reply = self._manager.get(self._createEmptyRequest(url)) + reply = self._manager.get(self.createEmptyRequest(url)) self._addCallback(reply, on_finished, ClusterPrintJobStatus) def movePrintJobToTop(self, print_job_uuid: str) -> None: """Move a print job to the top of the queue.""" url = "{}/print_jobs/{}/action/move".format(self.CLUSTER_API_PREFIX, print_job_uuid) - self._manager.post(self._createEmptyRequest(url), json.dumps({"to_position": 0, "list": "queued"}).encode()) + self._manager.post(self.createEmptyRequest(url, method=HttpRequestMethod.POST), json.dumps({"to_position": 0, "list": "queued"}).encode()) def forcePrintJob(self, print_job_uuid: str) -> None: """Override print job configuration and force it to be printed.""" url = "{}/print_jobs/{}".format(self.CLUSTER_API_PREFIX, print_job_uuid) - self._manager.put(self._createEmptyRequest(url), json.dumps({"force": True}).encode()) + self._manager.put(self.createEmptyRequest(url, method=HttpRequestMethod.PUT), json.dumps({"force": True}).encode()) def deletePrintJob(self, print_job_uuid: str) -> None: """Delete a print job from the queue.""" url = "{}/print_jobs/{}".format(self.CLUSTER_API_PREFIX, print_job_uuid) - self._manager.deleteResource(self._createEmptyRequest(url)) + self._manager.deleteResource(self.createEmptyRequest(url, method=HttpRequestMethod.DELETE)) def setPrintJobState(self, print_job_uuid: str, state: str) -> None: """Set the state of a print job.""" @@ -101,25 +133,33 @@ class ClusterApiClient: url = "{}/print_jobs/{}/action".format(self.CLUSTER_API_PREFIX, print_job_uuid) # We rewrite 'resume' to 'print' here because we are using the old print job action endpoints. action = "print" if state == "resume" else state - self._manager.put(self._createEmptyRequest(url), json.dumps({"action": action}).encode()) + self._manager.put(self.createEmptyRequest(url, method=HttpRequestMethod.PUT), json.dumps({"action": action}).encode()) def getPrintJobPreviewImage(self, print_job_uuid: str, on_finished: Callable) -> None: """Get the preview image data of a print job.""" url = "{}/print_jobs/{}/preview_image".format(self.CLUSTER_API_PREFIX, print_job_uuid) - reply = self._manager.get(self._createEmptyRequest(url)) + reply = self._manager.get(self.createEmptyRequest(url)) self._addCallback(reply, on_finished) - def _createEmptyRequest(self, path: str, content_type: Optional[str] = "application/json") -> QNetworkRequest: + def createEmptyRequest(self, path: str, content_type: Optional[str] = "application/json", method: HttpRequestMethod = HttpRequestMethod.GET, skip_auth: bool = False) -> QNetworkRequest: """We override _createEmptyRequest in order to add the user credentials. - :param url: The URL to request + :param path: Part added to the base-endpoint forming the total request URL (the path from the endpoint to the requested resource). :param content_type: The type of the body contents. + :param method: The HTTP method to use, such as GET, POST, PUT, etc. + :param skip_auth: Skips the authentication step if set; prevents a loop on request of authentication token. """ url = QUrl("http://" + self._address + path) request = QNetworkRequest(url) if content_type: request.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader, content_type) + if self._auth_id and self._auth_key: + digest_str = self._makeAuthDigestHeaderPart(path, method=method) + request.setRawHeader(b"Authorization", f"Digest {digest_str}".encode("utf-8")) + self._nonce_count += 1 + elif not skip_auth: + self._setupAuth() return request @staticmethod @@ -158,6 +198,64 @@ class ClusterApiClient: except (JSONDecodeError, TypeError, ValueError): Logger.log("e", "Could not parse response from network: %s", str(response)) + def _makeAuthDigestHeaderPart(self, url_part: str, method: HttpRequestMethod = HttpRequestMethod.GET) -> str: + """ Make the data-part for a Digest Authentication HTTP-header. + + :param url_part: The part of the URL beyond the host name. + :param method: The HTTP method to use, such as GET, POST, PUT, etc. + :return: A string with the data, can be used as in `f"Digest {return_value}".encode()`. + """ + + def sha256_utf8(x: str) -> str: + return hashlib.sha256(x.encode("utf-8")).hexdigest() + + nonce = secrets.token_hex(ClusterApiClient.AUTH_NONCE_LEN) if self._nonce is None else self._nonce + cnonce = secrets.token_hex(ClusterApiClient.AUTH_CNONCE_LEN) + auth_nc = f"{self._nonce_count:08x}" + + ha1 = sha256_utf8(f"{self._auth_id}:{ClusterApiClient.AUTH_REALM}:{self._auth_key}") + ha2 = sha256_utf8(f"{method}:{url_part}") + resp_digest = sha256_utf8(f"{ha1}:{nonce}:{auth_nc}:{cnonce}:{ClusterApiClient.AUTH_QOP}:{ha2}") + return ", ".join([ + f'username="{self._auth_id}"', + f'realm="{ClusterApiClient.AUTH_REALM}"', + f'nonce="{nonce}"', + f'uri="{url_part}"', + f'nc={auth_nc}', + f'cnonce="{cnonce}"', + f'qop={ClusterApiClient.AUTH_QOP}', + f'response="{resp_digest}"', + f'algorithm="SHA-256"' + ]) + + def _setupAuth(self) -> None: + """ Handles the setup process for authentication by making a temporary digest-token request to the printer API. + """ + + if self._auth_tries >= ClusterApiClient.AUTH_MAX_TRIES: + Logger.warning("Maximum authorization temporary digest-token request tries exceeded. Is printer-firmware up to date?") + return + + def on_finished(resp) -> None: + self._auth_tries += 1 + try: + auth_info = json.loads(resp.data().decode()) + self._auth_id = auth_info["id"] + self._auth_key = auth_info["key"] + except Exception as ex: + Logger.warning(f"Couldn't get temporary digest token: {str(ex)}") + return + self._auth_tries = 0 + + url = "{}/auth/request".format(self.PRINTER_API_PREFIX) + request_body = json.dumps({ + "application": CuraApplication.getInstance().getApplicationDisplayName(), + "user": f"user@{platform.node()}", + }).encode("utf-8") + reply = self._manager.post(self.createEmptyRequest(url, method=HttpRequestMethod.POST, skip_auth=True), request_body) + + self._addCallback(reply, on_finished) + def _addCallback(self, reply: QNetworkReply, on_finished: Union[Callable[[ClusterApiClientModel], Any], Callable[[List[ClusterApiClientModel]], Any]], model: Type[ClusterApiClientModel] = None, ) -> None: @@ -179,6 +277,11 @@ class ClusterApiClient: return if reply.error() != QNetworkReply.NetworkError.NoError: + if reply.error() == QNetworkReply.NetworkError.AuthenticationRequiredError: + nonce_match = re.search(r'nonce="([^"]+)', str(reply.rawHeader(b"WWW-Authenticate"))) + if nonce_match: + self._nonce = nonce_match.group(1) + self._nonce_count = 1 self._on_error(reply.errorString()) return diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py index 2a57bd0321..f51ff5a4e8 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py @@ -94,15 +94,15 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): @pyqtSlot(str, name="sendJobToTop") def sendJobToTop(self, print_job_uuid: str) -> None: - self._getApiClient().movePrintJobToTop(print_job_uuid) + self.getApiClient().movePrintJobToTop(print_job_uuid) @pyqtSlot(str, name="deleteJobFromQueue") def deleteJobFromQueue(self, print_job_uuid: str) -> None: - self._getApiClient().deletePrintJob(print_job_uuid) + self.getApiClient().deletePrintJob(print_job_uuid) @pyqtSlot(str, name="forceSendJob") def forceSendJob(self, print_job_uuid: str) -> None: - self._getApiClient().forcePrintJob(print_job_uuid) + self.getApiClient().forcePrintJob(print_job_uuid) def setJobState(self, print_job_uuid: str, action: str) -> None: """Set the remote print job state. @@ -111,20 +111,20 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): :param action: The action to undertake ('pause', 'resume', 'abort'). """ - self._getApiClient().setPrintJobState(print_job_uuid, action) + self.getApiClient().setPrintJobState(print_job_uuid, action) def _update(self) -> None: super()._update() if time() - self._time_of_last_request < self.CHECK_CLUSTER_INTERVAL: return # avoid calling the cluster too often - self._getApiClient().getPrinters(self._updatePrinters) - self._getApiClient().getPrintJobs(self._updatePrintJobs) + self.getApiClient().getPrinters(self._updatePrinters) + self.getApiClient().getPrintJobs(self._updatePrintJobs) self._updatePrintJobPreviewImages() def getMaterials(self, on_finished: Callable[[List[ClusterMaterial]], Any]) -> None: """Get a list of materials that are installed on the cluster host.""" - self._getApiClient().getMaterials(on_finished = on_finished) + self.getApiClient().getMaterials(on_finished = on_finished) def sendMaterialProfiles(self) -> None: """Sync the material profiles in Cura with the printer. @@ -204,7 +204,8 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): parts.append(self._createFormPart("name=require_printer_name", bytes(unique_name, "utf-8"), "text/plain")) # FIXME: move form posting to API client self.postFormWithParts("/cluster-api/v1/print_jobs/", parts, on_finished=self._onPrintUploadCompleted, - on_progress=self._onPrintJobUploadProgress) + on_progress=self._onPrintJobUploadProgress, + request=self.getApiClient().createEmptyRequest("/cluster-api/v1/print_jobs/", content_type=None, method="POST")) self._active_exported_job = None def _onPrintJobUploadProgress(self, bytes_sent: int, bytes_total: int) -> None: @@ -236,9 +237,9 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): for print_job in self._print_jobs: if print_job.getPreviewImage() is None: - self._getApiClient().getPrintJobPreviewImage(print_job.key, print_job.updatePreviewImageData) + self.getApiClient().getPrintJobPreviewImage(print_job.key, print_job.updatePreviewImageData) - def _getApiClient(self) -> ClusterApiClient: + def getApiClient(self) -> ClusterApiClient: """Get the API client instance.""" if not self._cluster_api: diff --git a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py index 9f5484ba15..3b9f127c77 100644 --- a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py @@ -147,7 +147,8 @@ class SendMaterialJob(Job): # FIXME: move form posting to API client self.device.postFormWithParts(target = "/cluster-api/v1/materials/", parts = parts, - on_finished = self._sendingFinished) + on_finished = self._sendingFinished, + request=self.device.getApiClient().createEmptyRequest("/cluster-api/v1/materials/", content_type=None, method="POST")) def _sendingFinished(self, reply: QNetworkReply) -> None: """Check a reply from an upload to the printer and log an error when the call failed""" diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 18d9466eb5..85b98e532b 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -97,8 +97,6 @@ class USBPrinterOutputDevice(PrinterOutputDevice): CuraApplication.getInstance().getOnExitCallbackManager().addCallback(self._checkActivePrintingUponAppExit) - CuraApplication.getInstance().getPreferences().addPreference("usb_printing/enabled", False) - # This is a callback function that checks if there is any printing in progress via USB when the application tries # to exit. If so, it will show a confirmation before def _checkActivePrintingUponAppExit(self) -> None: @@ -146,8 +144,6 @@ class USBPrinterOutputDevice(PrinterOutputDevice): CuraApplication.getInstance().getController().setActiveStage("MonitorStage") - CuraApplication.getInstance().getPreferences().setValue("usb_printing/enabled", True) - #Find the g-code to print. gcode_textio = StringIO() gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter")) diff --git a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py index 4eeeb7970b..a0c57441c8 100644 --- a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py +++ b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py @@ -20,6 +20,7 @@ from . import USBPrinterOutputDevice i18n_catalog = i18nCatalog("cura") +USB_PRINT_PREFERENCE_KEY = "usb_printing/enabled" @signalemitter class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin): @@ -43,7 +44,9 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin): self._update_thread = threading.Thread(target = self._updateThread) self._update_thread.daemon = True - self._check_updates = True + preferences = self._application.getPreferences() + preferences.addPreference(USB_PRINT_PREFERENCE_KEY, False) + self._check_updates = preferences.getValue(USB_PRINT_PREFERENCE_KEY) self._application.applicationShuttingDown.connect(self.stop) # Because the model needs to be created in the same thread as the QMLEngine, we use a signal. @@ -58,7 +61,7 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin): device.resetDeviceSettings() def start(self): - self._check_updates = True + self._check_updates = self._application.getPreferences().getValue(USB_PRINT_PREFERENCE_KEY) self._update_thread.start() def stop(self, store_data: bool = True): diff --git a/printer-linter/src/printerlinter/linters/defintion.py b/printer-linter/src/printerlinter/linters/defintion.py index a95fede55a..3e325a7522 100644 --- a/printer-linter/src/printerlinter/linters/defintion.py +++ b/printer-linter/src/printerlinter/linters/defintion.py @@ -145,17 +145,18 @@ class Definition(Linter): if "overrides" not in self._definitions[inherits_from]: return self._isDefinedInParent(key, value_dict, self._definitions[inherits_from]["inherits"]) - parent = self._definitions[inherits_from]["overrides"] + parent = self._definitions[inherits_from] + parent_overrides = self._definitions[inherits_from]["overrides"] if key not in self._definitions[self.base_def]["overrides"]: is_number = False else: is_number = self._definitions[self.base_def]["overrides"][key]["type"] in ("float", "int") for child_key, child_value in value_dict.items(): - if key in parent: + if key in parent_overrides: if child_key in ("default_value", "value"): - check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None] + check_values = [cv for cv in [parent_overrides[key].get("default_value", None), parent_overrides[key].get("value", None)] if cv is not None] else: - check_values = [parent[key].get(child_key, None)] + check_values = [parent_overrides[key].get(child_key, None)] for check_value in check_values: if is_number and child_key in ("default_value", "value"): try: @@ -170,10 +171,10 @@ class Definition(Linter): v = child_value cv = check_value if v == cv: - return True, child_key, child_value, parent, inherits_from + return True, child_key, child_value, parent_overrides, inherits_from - if "inherits" in parent: - return self._isDefinedInParent(key, value_dict, parent["inherits"]) + if "inherits" in parent: + return self._isDefinedInParent(key, value_dict, parent["inherits"]) return False, None, None, None, None def _loadExperimentalSettings(self): diff --git a/resources/definitions/anycubic_kobra_s1.def.json b/resources/definitions/anycubic_kobra_s1.def.json new file mode 100644 index 0000000000..09fc5c64e2 --- /dev/null +++ b/resources/definitions/anycubic_kobra_s1.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Anycubic Kobra S1", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "takanuva15", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "platform": "anycubic_kobra_s1_buildplate.obj", + "has_machine_quality": true, + "has_materials": true, + "has_textured_buildplate": true, + "has_variant_buildplates": false, + "has_variants": false, + "machine_extruder_trains": { "0": "anycubic_kobra_s1_extruder_0" }, + "platform_texture": "anycubic_kobra_s1_buildplate_texture.png", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm" + }, + "overrides": + { + "machine_buildplate_type": { "default_value": "PEI Spring Steel" }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "; move printhead away from object\nG1 Z22.000 ; for object exclusion\nG1 E-.76675 F2400\n; fan off\nM106 S0\nM106 P2 S0\n;TYPE:Custom\n; filament end gcode\nG92 E0\nG1 E-2 F3000\nG1 Z24 F900 ; Move print head further up \nG1 F12000; present print\nG1 X44; throw_position_x\nG1 Y270; throw_position_y\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM106 P1 S0 ; turn off fan\nM106 P2 S0\nM106 P3 S0\nM84; disable motors \n; disable stepper motors\nM106 P3 S204\n\n; CONFIG FOR SCREEN PRINT PREVIEW\n; total filament used [g] = {filament_weight}\n\n; CONFIG_BLOCK_START = begin\n; filament_type = {material_type}\n; nozzle_temperature = {material_print_temperature}\n; bed_temperature = {material_bed_temperature}\n; CONFIG_BLOCK_END = end" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": + { + "default_value": "Anycubic Kobra S1", + "description": "Anycubic Kobra S1" + }, + "machine_start_gcode": { "default_value": "M106 S0\nM106 P2 S0\n;TYPE:Custom\nG9111 bedTemp={material_bed_temperature} extruderTemp={material_print_temperature}\nM117\nM106 P3 S153\nG90\nG21\nM83 ; use relative distances for extrusion\n; filament start gcode\nM900 K0.035 ; Override pressure advance value\nM106 S0\nM106 P2 S0\n\nM420 S1 ;load stored mesh to avoid auto-leveling" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 68852d805f..e633017431 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1427,11 +1427,10 @@ "z_seam_corner": { "label": "Seam Corner Preference", - "description": "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate.", + "description": "Control how corners on the model outline influence the position of the seam. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate.", "type": "enum", "options": { - "z_seam_corner_none": "None", "z_seam_corner_inner": "Hide Seam", "z_seam_corner_outer": "Expose Seam", "z_seam_corner_any": "Hide or Expose Seam", @@ -4712,10 +4711,9 @@ "description": "The distance between the nozzle and already printed outer walls when travelling inside a model.", "unit": "mm", "type": "float", - "default_value": 0, + "default_value": 0.6, "value": "machine_nozzle_size * 1.5", - "minimum_value": "0", - "minimum_value_warning": "machine_nozzle_size * 0.5", + "minimum_value": "machine_nozzle_size * 0.5", "maximum_value_warning": "machine_nozzle_size * 10", "enabled": "resolveOrValue('retraction_combing') != 'off'", "settable_per_mesh": false, @@ -7915,6 +7913,35 @@ "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", "settable_per_mesh": false, "settable_per_extruder": false + }, + "multi_material_paint_resolution": + { + "label": "Multi-material Precision", + "description": "The precision of the details when generating multi-material shapes based on painting data. A lower precision will provide more details, but increase the slicing time and memory.", + "unit": "mm", + "type": "float", + "enabled": "extruders_enabled_count > 1", + "default_value": 0.2, + "value": "min(line_width / 2, layer_height)", + "minimum_value": "0.05", + "maximum_value": "5", + "maximum_value_warning": "line_width * 2", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "multi_material_paint_deepness": + { + "label": "Multi-material Deepness", + "description": "The deepness of the painted details inside the model. A higher deepness will provide a better interlocking, but increase slicing time and memory. Set a very high value to go as deep as possible. The actually calculated deepness may vary.", + "unit": "mm", + "type": "float", + "enabled": "extruders_enabled_count > 1", + "default_value": 4, + "value": "line_width * 10", + "minimum_value": "line_width", + "minimum_value_warning": "line_width * 2", + "settable_per_mesh": false, + "settable_per_extruder": false } } }, @@ -8808,7 +8835,7 @@ "value": "line_width + support_xy_distance + 1.0", "enabled": "bridge_settings_enabled", "settable_per_mesh": true, - "settable_per_extruder": false + "settable_per_extruder": true }, "bridge_skin_support_threshold": { diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 710ee29a40..2149116a03 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -74,8 +74,8 @@ { "maximum_value": "max(35, min((material_bed_temperature + 20) / 2, 70))", "maximum_value_warning": "max(30, min((material_bed_temperature + 10) / 2, 70))", - "minimum_value": "max((material_bed_temperature - 30) / 2, 30)", - "minimum_value_warning": "max((material_bed_temperature - 20) / 2, 30)" + "minimum_value": "max((material_bed_temperature - 40) / 1.5, 30)", + "minimum_value_warning": "max((material_bed_temperature - 35) / 1.5, 30)" }, "cool_min_layer_time": { "value": 3 }, "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 12" }, @@ -86,6 +86,7 @@ "gantry_height": { "value": 35 }, "gradual_support_infill_steps": { "value": "3 if support_interface_enable and support_structure != 'tree' else 0" }, "group_outer_walls": { "value": "False" }, + "infill_angles": { "value": "[-40, 50] if infill_pattern in ('grid', 'lines', 'zigzag') else [ ]" }, "infill_before_walls": { "value": "False if infill_sparse_density > 50 else True" }, "infill_enable_travel_optimization": { "value": "True" }, "infill_material_flow": @@ -94,7 +95,7 @@ "value": "(1 + (skin_material_flow-infill_sparse_density) / 100 if infill_sparse_density > skin_material_flow else 1) * material_flow" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'triangles'" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'gyroid' if 15 < speed_infill / ( infill_line_width * 300 / infill_sparse_density ) < 25 else 'triangles'" }, "infill_sparse_density": { "maximum_value": "100" }, "infill_wipe_dist": { "value": "0" }, "inset_direction": { "value": "'inside_out'" }, @@ -199,6 +200,7 @@ "value": "skin_material_flow" }, "roofing_monotonic": { "value": "True" }, + "skin_angles": { "value": "[-40, 50]" }, "skin_material_flow": { "maximum_value": "100", diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index d2813ea8a3..c1a820f834 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -45,7 +45,6 @@ "ultimaker_bvoh_175", "ultimaker_cffpa_175", "ultimaker_cpe_175", - "ultimaker_nylon_175", "ultimaker_hips_175", "ultimaker_pc_175", "ultimaker_tpu_175", diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index e421b20529..ac37078571 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -701,7 +701,7 @@ 45 ] }, - "support_infill_rate": { "value": 20.0 }, + "support_infill_rate": { "value": "0 if support_structure == 'tree' else 20.0" }, "support_infill_sparse_thickness": { "value": "layer_height" }, "support_interface_enable": { "value": true }, "support_interface_height": { "value": "4*support_infill_sparse_thickness" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 37b11ad4ef..e5aa87afc1 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -44,7 +44,6 @@ "zyyx_pro_", "octofiber_", "fiberlogy_", - "ultimaker_nylon_175", "ultimaker_metallic_pla_175" ], "has_machine_materials": true, diff --git a/resources/definitions/ultimaker_replicator_plus.def.json b/resources/definitions/ultimaker_replicator_plus.def.json index edfab6d962..507fab6803 100644 --- a/resources/definitions/ultimaker_replicator_plus.def.json +++ b/resources/definitions/ultimaker_replicator_plus.def.json @@ -8,7 +8,7 @@ "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot-replicator_plus", - "platform": "ultimaker_replicator_plus_platform.3MF", + "platform": "ultimaker_replicator_plus_platform.obj", "exclude_materials": [ "dsm_", "Essentium_", @@ -77,9 +77,116 @@ "acceleration_enabled": { "enabled": false, - "value": false + "value": true + }, + "acceleration_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_prime_tower": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_print": + { + "enabled": false, + "value": 800 + }, + "acceleration_print_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_skirt_brim": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "enabled": false, + "value": "acceleration_support_interface" + }, + "acceleration_support_infill": + { + "enabled": false, + "value": "acceleration_support" + }, + "acceleration_support_interface": + { + "enabled": false, + "value": "acceleration_support" + }, + "acceleration_support_roof": + { + "enabled": false, + "value": "acceleration_support_interface" + }, + "acceleration_topbottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_travel": + { + "enabled": false, + "value": 5000 + }, + "acceleration_travel_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_travel_layer_0": + { + "enabled": false, + "value": "acceleration_travel" + }, + "acceleration_wall": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0": + { + "enabled": false, + "value": "acceleration_wall" + }, + "acceleration_wall_0_roofing": + { + "enabled": false, + "value": "acceleration_wall" + }, + "acceleration_wall_x": + { + "enabled": false, + "value": "acceleration_wall" + }, + "acceleration_wall_x_roofing": + { + "enabled": false, + "value": "acceleration_wall" }, "adhesion_type": { "value": "'raft'" }, + "bridge_skin_speed": { "value": 40 }, + "bridge_wall_speed": { "value": 40 }, "brim_width": { "value": "3" }, "cool_during_extruder_switch": { @@ -89,7 +196,7 @@ "cool_fan_full_at_height": { "value": "layer_height + layer_height_0" }, "cool_fan_speed": { "value": 100 }, "cool_fan_speed_0": { "value": 0 }, - "cool_min_layer_time": { "value": 5 }, + "cool_min_layer_time": { "value": 7 }, "extruder_prime_pos_abs": { "default_value": true }, "fill_outline_gaps": { "value": true }, "gantry_height": { "value": "60" }, @@ -110,7 +217,112 @@ "jerk_enabled": { "enabled": false, - "value": false + "value": true + }, + "jerk_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_print": + { + "enabled": false, + "value": 4 + }, + "jerk_print_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_skirt_brim": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "enabled": false, + "value": "jerk_support_interface" + }, + "jerk_support_infill": + { + "enabled": false, + "value": "jerk_support" + }, + "jerk_support_interface": + { + "enabled": false, + "value": "jerk_support" + }, + "jerk_support_roof": + { + "enabled": false, + "value": "jerk_support_interface" + }, + "jerk_topbottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": true + }, + "jerk_travel_layer_0": + { + "enabled": false, + "value": "jerk_travel" + }, + "jerk_wall": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x_roofing": + { + "enabled": false, + "value": "jerk_print" }, "layer_height_0": { "value": "0.2 if resolveOrValue('adhesion_type') == 'raft' else 0.3" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, @@ -178,18 +390,58 @@ "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, "print_sequence": { "enabled": false }, - "raft_airgap": { "value": 0.3 }, + "raft_acceleration": + { + "enabled": false, + "value": "acceleration_print" + }, + "raft_airgap": { "value": 0.33 }, + "raft_base_acceleration": + { + "enabled": false, + "value": "acceleration_print" + }, "raft_base_flow": { "value": 120 }, "raft_base_infill_overlap": { "value": 25 }, + "raft_base_jerk": + { + "enabled": false, + "value": "jerk_print" + }, "raft_base_line_spacing": { "value": 2.5 }, "raft_base_line_width": { "value": 2 }, "raft_base_thickness": { "value": 0.4 }, + "raft_interface_acceleration": + { + "enabled": false, + "value": "acceleration_print" + }, "raft_interface_fan_speed": { "value": 0 }, "raft_interface_infill_overlap": { "value": 25 }, + "raft_interface_jerk": + { + "enabled": false, + "value": "jerk_print" + }, "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_jerk": + { + "enabled": false, + "value": "jerk_print" + }, "raft_margin": { "value": 6.5 }, + "raft_surface_acceleration": + { + "enabled": false, + "value": "acceleration_print" + }, "raft_surface_fan_speed": { "value": 50.0 }, "raft_surface_infill_overlap": { "value": 35 }, + "raft_surface_jerk": + { + "enabled": false, + "value": "jerk_print" + }, "raft_surface_wall_count": { "value": "raft_wall_count" }, "raft_wall_count": { "value": 2 }, "retract_at_layer_change": { "value": true }, @@ -197,9 +449,9 @@ { "maximum_value": 5, "maximum_value_warning": 2.5, - "value": 0.5 + "value": 1.0 }, - "retraction_combing": { "value": "'infill'" }, + "retraction_combing": { "value": "'no_outer_surfaces'" }, "retraction_count_max": { "maximum_value": 700, diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index cbd6e255f8..ed1915cbe9 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -209,14 +209,11 @@ "value": 35 }, "bridge_skin_speed_2": { "value": "speed_print*2/3" }, - "bridge_sparse_infill_max_density": { "value": 50 }, + "bridge_skin_support_threshold": { "value": 20 }, + "bridge_sparse_infill_max_density": { "value": 20 }, "bridge_wall_material_flow": { "value": 200 }, "bridge_wall_min_length": { "value": 2 }, - "bridge_wall_speed": - { - "unit": "mm/s", - "value": 50 - }, + "bridge_wall_speed": { "value": 50 }, "build_volume_temperature": { "force_depends_on_settings": [ @@ -237,7 +234,10 @@ "default_material_print_temperature": { "maximum_value_warning": 320 }, "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" }, "flooring_layer_count": { "value": 1 }, - "gradual_flow_enabled": { "value": false }, + "flooring_material_flow": { "value": "skin_material_flow * 110/93" }, + "flooring_monotonic": { "value": false }, + "gradual_flow_discretisation_step_size": { "value": 1 }, + "gradual_flow_enabled": { "value": true }, "hole_xy_offset": { "value": 0.075 }, "infill_material_flow": { "value": "material_flow if infill_sparse_density < 95 else 95" }, "infill_overlap": { "value": 10 }, @@ -384,6 +384,7 @@ "unit": "m/s\u00b3", "value": "jerk_wall_0" }, + "keep_retracting_during_travel": { "enabled": false }, "machine_gcode_flavor": { "default_value": "Cheetah" }, "machine_max_acceleration_x": { "default_value": 50000 }, "machine_max_acceleration_y": { "default_value": 50000 }, @@ -428,26 +429,31 @@ }, "material_print_temperature": { "maximum_value_warning": 320 }, "material_print_temperature_layer_0": { "maximum_value_warning": 320 }, - "max_flow_acceleration": { "value": 8.0 }, + "max_flow_acceleration": { "value": 1.5 }, "max_skin_angle_for_expansion": { "value": 45 }, "meshfix_maximum_resolution": { "value": 0.4 }, "min_infill_area": { "default_value": 10 }, "optimize_wall_printing_order": { "value": false }, + "prime_during_travel_ratio": { "enabled": false }, "prime_tower_brim_enable": { "value": true }, "prime_tower_min_volume": { "value": 10 }, "prime_tower_mode": { "resolve": "'normal'" }, "retraction_amount": { "value": 6.5 }, "retraction_combing_avoid_distance": { "value": 1.2 }, "retraction_combing_max_distance": { "value": 50 }, + "retraction_during_travel_ratio": { "enabled": false }, "retraction_hop": { "value": 1 }, "retraction_hop_after_extruder_switch_height": { "value": 2 }, "retraction_hop_enabled": { "value": true }, "retraction_min_travel": { "value": "2.5 if support_enable and support_structure=='tree' else line_width * 2.5" }, "retraction_prime_speed": { "value": 15 }, - "skin_edge_support_thickness": { "value": 0 }, + "roofing_monotonic": { "value": false }, + "roofing_pattern": { "value": "'zigzag'" }, + "seam_overhang_angle": { "value": 35 }, + "skin_edge_support_thickness": { "value": 0.8 }, "skin_material_flow": { "value": 93 }, "skin_outline_count": { "value": 0 }, - "skin_overlap": { "value": 0 }, + "skin_overlap": { "value": 20 }, "skin_preshrink": { "value": 0 }, "skirt_brim_minimal_length": { "value": 1000 }, "skirt_brim_speed": @@ -543,12 +549,12 @@ "speed_wall": { "maximum_value_warning": 300, - "value": "speed_print*2/3" + "value": "speed_print*1/2" }, "speed_wall_0": { "maximum_value_warning": 300, - "value": "speed_wall" + "value": "speed_wall*60/75" }, "speed_wall_0_flooring": { diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 529abc0940..a9883d268f 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -158,7 +158,7 @@ "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, "machine_name": { "default_value": "MakerBot Sketch Sprint" }, - "machine_start_gcode": { "default_value": "G28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\nG1 Z0.25 F6000\nG1 E-1.5 F800\nG1 E2 F800\nG1 X111 Y111 Z0.25 F4800\nG1 X111 Y-111 E25 F1200" }, + "machine_start_gcode": { "default_value": "G28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\nSET_SERVO SERVO=my_servo ANGLE=180\nSET_FAN_SPEED FAN=external_fan SPEED=1\nSET_FAN_SPEED FAN=internal_fan SPEED=1\nG1 Z0.25 F6000\nG1 E-1.5 F800\nG1 E2 F800\nG1 X111 Y111 Z0.25 F4800\nG1 X111 Y-111 E25 F1200" }, "machine_width": { "default_value": 221.5 }, "material_bed_temp_wait": { "value": "False" }, "material_bed_temperature": diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index d08166d60d..f38fccbb0e 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -21,36 +21,37 @@ }, "overrides": { - "acceleration_enabled": { "default_value": false }, - "acceleration_layer_0": { "value": 1800 }, - "acceleration_print": { "default_value": 2200 }, - "acceleration_roofing": { "value": 1800 }, - "acceleration_travel_layer_0": { "value": 1800 }, - "acceleration_wall_0": { "value": 1800 }, - "adhesion_type": { "default_value": "skirt" }, - "alternate_extra_perimeter": { "default_value": true }, - "bridge_fan_speed": { "default_value": 100 }, + "acceleration_enabled": { "default_value": true }, + "acceleration_layer_0": { "value": "math.ceil(acceleration_print / 10)" }, + "acceleration_print": { "default_value": 5000 }, + "acceleration_roofing": { "value": "math.ceil(acceleration_topbottom * 3000 / 5000) " }, + "acceleration_support": { "value": "math.ceil(acceleration_print / 2)" }, + "acceleration_travel": { "value": "acceleration_print if magic_spiralize else min(math.ceil(acceleration_print * 7000 / 5000), round((machine_max_acceleration_x + machine_max_acceleration_y) / 2, -2))" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 3000 / 5000)" }, + "adhesion_type": + { + "default_value": "skirt", + "value": "'brim' if draft_shield_enabled else 'skirt'" + }, "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, "bridge_settings_enabled": { "default_value": true }, "bridge_wall_coast": { "default_value": 10 }, "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" }, "cool_fan_full_layer": { "value": 4 }, - "cool_fan_speed_min": { "value": "cool_fan_speed" }, "cool_min_layer_time": { "default_value": 15 }, - "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, - "fill_outline_gaps": { "default_value": true }, + "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" }, + "cool_min_speed": { "value": "max(round(speed_layer_0 / 2), round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 2))" }, "gantry_height": { "value": 30 }, "infill_before_walls": { "default_value": false }, "infill_enable_travel_optimization": { "default_value": true }, - "jerk_enabled": { "default_value": false }, - "jerk_roofing": { "value": 10 }, - "jerk_wall_0": { "value": 10 }, - "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, - "line_width": { "value": "machine_nozzle_size * 1.125" }, - "machine_acceleration": { "default_value": 1500 }, + "infill_line_width": { "value": "machine_nozzle_size * 1.5" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'gyroid'" }, + "initial_layer_line_width_factor": { "default_value": 125.0 }, + "layer_height_0": { "resolve": "max(machine_nozzle_size / 2, min(extruderValues('layer_height')))" }, + "machine_acceleration": { "default_value": 5000 }, "machine_depth": { "default_value": 250 }, - "machine_end_gcode": { "default_value": "print_end" }, + "machine_end_gcode": { "default_value": "PRINT_END" }, "machine_endstop_positive_direction_x": { "default_value": true }, "machine_endstop_positive_direction_y": { "default_value": true }, "machine_endstop_positive_direction_z": { "default_value": false }, @@ -67,16 +68,15 @@ }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 250 }, - "machine_max_acceleration_x": { "default_value": 1500 }, - "machine_max_acceleration_y": { "default_value": 1500 }, - "machine_max_acceleration_z": { "default_value": 250 }, + "machine_max_acceleration_x": { "default_value": 20000 }, + "machine_max_acceleration_y": { "default_value": 20000 }, + "machine_max_acceleration_z": { "default_value": 500 }, "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, "machine_max_feedrate_z": { "default_value": 40 }, - "machine_max_jerk_e": { "default_value": 60 }, - "machine_max_jerk_xy": { "default_value": 20 }, - "machine_max_jerk_z": { "default_value": 1 }, "machine_name": { "default_value": "VORON2" }, - "machine_start_gcode": { "default_value": ";Nozzle diameter = {machine_nozzle_size}\n;Filament type = {material_type}\n;Filament name = {material_name}\n;Filament weight = {filament_weight}\n; M190 S{material_bed_temperature_layer_0}\n; M109 S{material_print_temperature_layer_0}\nprint_start EXTRUDER={material_print_temperature_layer_0} BED={material_bed_temperature_layer_0} CHAMBER={build_volume_temperature}" }, + "machine_start_gcode": { "default_value": ";Nozzle diameter = {machine_nozzle_size}\n;Filament type = {material_type}\n;Filament name = {material_name}\n;Filament weight = {filament_weight}\n; M190 S{material_bed_temperature_layer_0}\n; M109 S{material_print_temperature_layer_0}\nPRINT_START EXTRUDER={material_print_temperature_layer_0} BED={material_bed_temperature_layer_0} CHAMBER={build_volume_temperature}" }, "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, "machine_steps_per_mm_z": { "default_value": 400 }, @@ -84,40 +84,36 @@ "meshfix_maximum_resolution": { "default_value": 0.01 }, "min_infill_area": { "default_value": 5.0 }, "minimum_polygon_circumference": { "default_value": 0.2 }, - "optimize_wall_printing_order": { "default_value": true }, "retraction_amount": { "default_value": 0.75 }, "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "default_value": 10 }, - "retraction_hop": { "default_value": 0.2 }, - "retraction_hop_enabled": { "default_value": true }, - "retraction_prime_speed": + "retraction_hop": { - "maximum_value_warning": 130, - "value": "math.ceil(retraction_speed * 0.4)" + "default_value": 0.2, + "value": "machine_nozzle_size / 2" }, - "retraction_retract_speed": { "maximum_value_warning": 130 }, + "retraction_hop_enabled": { "default_value": true }, + "retraction_hop_only_when_collides": { "default_value": true }, + "retraction_prime_speed": { "maximum_value_warning": "machine_max_feedrate_e - 10" }, + "retraction_retract_speed": { "maximum_value_warning": "machine_max_feedrate_e - 10" }, "retraction_speed": { "default_value": 30, - "maximum_value_warning": 130 + "maximum_value_warning": "machine_max_feedrate_e - 10" }, "roofing_layer_count": { "value": 1 }, "skirt_brim_minimal_length": { "default_value": 550 }, - "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, - "speed_roofing": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_infill": { "value": "speed_print * 1.5" }, + "speed_layer_0": { "value": "speed_print * 3 / 8" }, + "speed_print": { "value": "round(6.4 / layer_height / machine_nozzle_size, -1)" }, "speed_slowdown_layers": { "default_value": 4 }, - "speed_topbottom": { "value": "math.ceil(speed_print * 0.33)" }, "speed_travel": { - "maximum_value_warning": 501, - "value": 300 + "maximum_value_warning": "max(500, round((machine_max_feedrate_x + machine_max_feedrate_y) / 2, -2)) + 1", + "value": "speed_print if magic_spiralize else max(speed_print, round((machine_max_feedrate_x + machine_max_feedrate_y) / 2, -2))" }, - "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, - "speed_wall": { "value": "math.ceil(speed_print * 0.33)" }, - "speed_wall_0": { "value": "math.ceil(speed_print * 0.33)" }, - "speed_wall_x": { "value": "math.ceil(speed_print * 0.66)" }, - "travel_avoid_other_parts": { "default_value": false }, - "wall_line_width": { "value": "machine_nozzle_size" }, + "speed_z_hop": { "value": "max(10, machine_max_feedrate_z / 2)" }, + "top_bottom_thickness": { "value": "wall_thickness" }, "wall_overhang_angle": { "default_value": 75 }, "wall_overhang_speed_factors": { @@ -125,6 +121,11 @@ 50 ] }, - "zig_zaggify_infill": { "value": true } + "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" }, + "xy_offset_layer_0": { "value": "xy_offset - 0.1" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_relative": { "value": "True" }, + "zig_zaggify_infill": { "value": true }, + "zig_zaggify_support": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 4df6e50a85..73b08ec6ef 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -75,10 +75,6 @@ "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", @@ -186,9 +182,7 @@ "machine_extruder_trains": { "0": "zyyx_plus_extruder_0" }, "machine_x3g_variant": "z", "preferred_material": "generic_pla", - "preferred_quality_type": "normal", - "quality_definition": "zyyx_plus", - "setting_version": 3 + "preferred_quality_type": "normal" }, "overrides": { diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 3fdfbe27d7..385cf9b0ff 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -73,10 +73,6 @@ "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", @@ -185,8 +181,6 @@ "machine_x3g_variant": "z", "preferred_material": "generic_pla", "preferred_variant_name": "Carbon0.6", - "quality_definition": "zyyx_pro", - "setting_version": 3, "variants_name": "SwiftTool" }, "overrides": diff --git a/resources/extruders/anycubic_kobra_s1_extruder_0.def.json b/resources/extruders/anycubic_kobra_s1_extruder_0.def.json new file mode 100644 index 0000000000..c850757b6e --- /dev/null +++ b/resources/extruders/anycubic_kobra_s1_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "anycubic_kobra_s1", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/images/anycubic_kobra_s1_buildplate_texture.png b/resources/images/anycubic_kobra_s1_buildplate_texture.png new file mode 100644 index 0000000000..1f80dd346d Binary files /dev/null and b/resources/images/anycubic_kobra_s1_buildplate_texture.png differ diff --git a/resources/images/cura.png b/resources/images/cura.png index b2f304fce3..10d1c0a375 100644 Binary files a/resources/images/cura.png and b/resources/images/cura.png differ diff --git a/resources/images/cura_enterprise.png b/resources/images/cura_enterprise.png index 203ee4c63f..81141415d7 100644 Binary files a/resources/images/cura_enterprise.png and b/resources/images/cura_enterprise.png differ diff --git a/resources/images/cura_wip.png b/resources/images/cura_wip.png index 038619a616..031e37f15b 100644 Binary files a/resources/images/cura_wip.png and b/resources/images/cura_wip.png differ diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm_engineering.inst.cfg index 706dd59ef5..aa54f58a51 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm_engineering.inst.cfg index f350a10415..941bfb3301 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm_engineering.inst.cfg index a14b5e3c7e..d743434f90 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm_engineering.inst.cfg index c41d9c0523..65eb1037d9 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm_engineering.inst.cfg index 7bb37bb00e..9a8d6fc7c7 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm_engineering.inst.cfg index 5b2e0c6168..f864a2e9dd 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm_engineering.inst.cfg index 453f87fa42..5d519aa3f3 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm_engineering.inst.cfg @@ -17,5 +17,5 @@ jerk_print = 30 material_bed_temperature = =default_material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature + 15 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg index e83448c3e5..44df75f9f4 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg @@ -15,5 +15,5 @@ variant = AA 0.4 jerk_print = 30 material_print_temperature = =default_material_print_temperature + 10 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg index 987c75e613..ad8fed3bcc 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffpa_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffpa_0.2mm_engineering.inst.cfg index a02449ed8f..270c51da42 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffpa_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffpa_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg index 0b648b2379..27fd793c4a 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffpa_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffpa_0.2mm_engineering.inst.cfg index d84dad5068..22f71bc813 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffpa_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffpa_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg index b5ba198105..64b41de151 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_strong.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_strong.inst.cfg index 1930715076..1b1751d4f3 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_strong.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm_strong.inst.cfg @@ -15,5 +15,5 @@ variant = CC 0.4 jerk_print = 30 material_print_temperature = =default_material_print_temperature + 20 speed_print = 80 -wall_thickness = =line_width * 4 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 3 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm_engineering.inst.cfg index d327152850..f40b320f9c 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.4 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg index 12c015ec1d..b66407fd0c 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.6 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffpa_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffpa_0.2mm_engineering.inst.cfg index a1bc915888..b2cd53deba 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffpa_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffpa_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.6 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg index f8df8291be..fd8e00205d 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.6 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffpa_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffpa_0.2mm_engineering.inst.cfg index 8fe4b441bf..e9848e792f 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffpa_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffpa_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.6 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg index 51b8d16f13..9a2a69f1e4 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.6 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_strong.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_strong.inst.cfg index bb527f58f7..4a2fc57b41 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_strong.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm_strong.inst.cfg @@ -15,5 +15,5 @@ variant = CC 0.6 jerk_print = 30 material_print_temperature = =default_material_print_temperature + 20 speed_print = 80 -wall_thickness = =line_width * 4 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 3 diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm_engineering.inst.cfg index cb438e20e5..11b7a7f26c 100644 --- a/resources/intent/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC 0.6 [values] jerk_print = 30 speed_print = 80 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm_engineering.inst.cfg index 1770a1ab47..91c03b0bd1 100644 --- a/resources/intent/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm_engineering.inst.cfg @@ -13,6 +13,5 @@ variant = HT 0.6 [values] jerk_print = 30 -speed_print = 70 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg index f77b3eadc1..676d2cf37d 100644 --- a/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -13,6 +13,5 @@ variant = HT 0.6 [values] jerk_print = 30 -speed_print = 70 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_strong.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_strong.inst.cfg index 930841fcd3..8a9f07b61d 100644 --- a/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_strong.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm_strong.inst.cfg @@ -15,5 +15,5 @@ variant = HT 0.6 jerk_print = 30 material_print_temperature = =default_material_print_temperature + 20 speed_print = 80 -wall_thickness = =line_width * 4 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 3 diff --git a/resources/intent/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm_engineering.inst.cfg index a3ae283c8e..3b980ef62f 100644 --- a/resources/intent/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm_engineering.inst.cfg @@ -13,6 +13,5 @@ variant = HT 0.6 [values] jerk_print = 30 -speed_print = 70 -wall_thickness = =line_width * 3 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 diff --git a/resources/intent/ultimaker_method/um_method_1a_um-nylon-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-nylon-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..912d71d2eb --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1a_um-nylon-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1A + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..ed8949a519 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..f77d77afa2 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-nylon-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-nylon-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..e9d7188457 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-nylon-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1A + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg index f5a00d9db1..52345bc4c6 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg @@ -22,6 +22,7 @@ cool_min_temperature = 245.0 infill_pattern = zigzag jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg index 2e098b3a0b..72a2f8e143 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -26,6 +26,7 @@ infill_pattern = zigzag infill_sparse_density = 99 jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..ae2bc39db8 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg index 0db1a5b803..4f65ccabe5 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg @@ -22,6 +22,7 @@ cool_min_temperature = 245.0 infill_pattern = zigzag jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg index b6ff6e1ebd..9bdbbe3019 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -26,6 +26,7 @@ infill_pattern = zigzag infill_sparse_density = 99 jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg index 4b42af13fa..c9bd04bcdb 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg @@ -22,6 +22,7 @@ cool_min_temperature = 245.0 infill_pattern = zigzag jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg index 69a50a831b..a69db2d057 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -26,6 +26,7 @@ infill_pattern = zigzag infill_sparse_density = 99 jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..e5a0fe6dc8 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg index 0328525090..f0a38b5a25 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg @@ -22,6 +22,7 @@ cool_min_temperature = 245.0 infill_pattern = zigzag jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg index 0c2bb88cc7..9ad152ffcd 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -26,6 +26,7 @@ infill_pattern = zigzag infill_sparse_density = 99 jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg index a82ddaa428..3835fdfedf 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg @@ -22,6 +22,7 @@ cool_min_temperature = 245.0 infill_pattern = zigzag jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg index 9aebcb531b..0e6f4d11cd 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -26,6 +26,7 @@ infill_pattern = zigzag infill_sparse_density = 99 jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg index 11aa6d2878..48340b2e09 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg @@ -22,6 +22,7 @@ cool_min_temperature = 245.0 infill_pattern = zigzag jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg index ea8caef493..bb48267880 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -26,6 +26,7 @@ infill_pattern = zigzag infill_sparse_density = 99 jerk_print = 35 speed_layer_0 = 55 +speed_prime_tower = =speed_print/5 speed_print = 300 speed_support = 100 speed_support_interface = 75 diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.06mm_visual.inst.cfg new file mode 100644 index 0000000000..3fd772bc9a --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.06mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_abs +quality_type = high +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..35ef159b08 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_abs +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..1cf65b7420 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.15mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_abs +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..75e96df5de --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_abs +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..84a20a70b2 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.1mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_abs +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..1611a8c98b --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_abs_0.2mm_quick.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_abs +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_sparse_density = 15 +jerk_print = 6000 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = 0.8 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..4438e60ba4 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_cpe_plus +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..21d666987a --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_cpe_plus +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..27fcf62b42 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_cpe +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..691ee76257 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_cpe_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_cpe +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_nylon_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_nylon_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..69af94a877 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_nylon_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_nylon +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_nylon_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_nylon_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..186d983d70 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_nylon_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_nylon +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pc_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pc_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..c268152027 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pc_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_pc +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pc_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pc_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..7bf0185ad7 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pc_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_pc +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_petg_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_petg_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..e904940c1c --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_petg_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_petg +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_petg_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_petg_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..8352264ce3 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_petg_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_petg +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.06mm_visual.inst.cfg new file mode 100644 index 0000000000..1beb9ff420 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.06mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_pla +quality_type = high +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..26a469b3ca --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..d6ef6be8d6 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.15mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..fc724077d4 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..f07a50634f --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.1mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..3f4afa78a2 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.2mm_quick.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_sparse_density = 15 +jerk_print = 6000 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = 0.8 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..4d610a1898 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_pla_0.3mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_pla +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 4000 +acceleration_wall = 2000 +acceleration_wall_0 = 2000 +infill_sparse_density = 10 +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 50 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = 0.8 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.06mm_visual.inst.cfg new file mode 100644 index 0000000000..99d54efaf8 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.06mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_tough_pla +quality_type = high +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..3909c8fef3 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_tough_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..ee2e6689c6 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_tough_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..002a62dbe8 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_tough_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..59945fd42a --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = generic_tough_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..ad6c6d9caa --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.2mm_quick.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_tough_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_sparse_density = 15 +jerk_print = 6000 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = 0.8 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..475c0f762f --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_tough-pla_0.3mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_tough_pla +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 4000 +acceleration_wall = 2000 +acceleration_wall_0 = 2000 +infill_sparse_density = 10 +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 50 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = 0.8 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.06mm_visual.inst.cfg new file mode 100644 index 0000000000..9501ee84f5 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.06mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_abs +quality_type = high +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..e47f1f880f --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_abs +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..a931d387f1 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_abs +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..8901a3a3d7 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_abs +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..23cce47191 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_abs +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..125c98629b --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..f51eb549db --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..f2511d5682 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..ed69933780 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-abs_0.3mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_abs +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.06mm_visual.inst.cfg new file mode 100644 index 0000000000..04d9ca618a --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.06mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_petg +quality_type = high +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..7eb837e8ed --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_petg +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..22e7f1cce0 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_petg +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..8bc584579f --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_petg +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..6b1376ee8d --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_petg +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..fafb5ed482 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..dff13b77e5 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..0c18517ec8 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..6bd4c9511b --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-petg_0.3mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_petg +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.06mm_visual.inst.cfg new file mode 100644 index 0000000000..de16fb580c --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.06mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_pla +quality_type = high +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..7131a95e99 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..e5b167899d --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..2f1ab4ce0b --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..d8da7b01f1 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..851b16ec93 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..d7083a1710 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..aa118954d9 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..2c96950b23 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-pla_0.3mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_pla +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg new file mode 100644 index 0000000000..1e14a72716 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_tough_pla +quality_type = high +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..8e93be0541 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_tough_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..e7e8fb4850 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_tough_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..598a4c14de --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_tough_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..a805c2d19a --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_tough_pla +quality_type = normal +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..f4795adb16 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..7bbde83ab6 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..53941a55ae --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..9be59e8f34 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_tough_pla +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.4 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_print = 150 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =2 * line_width + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..c0e12d7dfe --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..f83fa05ef1 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..76dbed7bbb --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..2adc34f814 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.3mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_abs +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.4mm_quick.inst.cfg new file mode 100644 index 0000000000..c942788b53 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-abs_0.4mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_abs +quality_type = superdraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..c397b814a8 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..34cd9ca253 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..ea99b40063 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..e57f5cf733 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.3mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_petg +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.4mm_quick.inst.cfg new file mode 100644 index 0000000000..b13f8eaa8f --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-petg_0.4mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_petg +quality_type = superdraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..318d23b2f9 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..eff16d83b2 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..cc3ba1cf77 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..da5b69ea5c --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.3mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_pla +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.4mm_quick.inst.cfg new file mode 100644 index 0000000000..3e42e01b7f --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-pla_0.4mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_pla +quality_type = superdraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..01c4378231 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +jerk_print = 6000 +max_flow_acceleration = 1 +speed_infill = =speed_print +speed_print = 35 +speed_roofing = =speed_topbottom +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..cf4b45ba7a --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg new file mode 100644 index 0000000000..08141b951f --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_print = 2500 +acceleration_wall_0 = 1000 +inset_direction = inside_out +jerk_wall_0 = 4000 +max_flow_acceleration = 0.5 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(35/50)) +speed_wall_0 = =math.ceil(speed_wall*(20/50)) +speed_wall_x = =math.ceil(speed_wall*(35/50)) +top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..bb89d11824 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_tough_pla +quality_type = verydraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg new file mode 100644 index 0000000000..16e936fb96 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = ultimaker_tough_pla +quality_type = superdraft +setting_version = 25 +type = intent +variant = AA 0.8 + +[values] +acceleration_wall_0 = 2000 +gradual_flow_enabled = False +gradual_infill_step_height = =4 * layer_height +gradual_infill_steps = 3 +infill_sparse_density = 40 +jerk_print = 6000 +jerk_wall_0 = 6000 +speed_wall = =speed_print +speed_wall_0 = 40 +top_bottom_thickness = =4 * layer_height +wall_thickness = =wall_line_width_0 + diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg index 1d1cae70e6..9e6032024b 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = AA+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg index 9889424797..1527b99002 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg @@ -16,7 +16,13 @@ cool_min_layer_time = 5 cool_min_layer_time_overhang = 9 cool_min_speed = 6 cool_min_temperature = =material_print_temperature - 15 +gradual_flow_enable = False +hole_xy_offset = 0.075 +inset_direction = outside_in +speed_wall = =speed_print speed_wall_x = =speed_print speed_wall_x_roofing = =speed_wall wall_line_width_x = =wall_line_width +wall_thickness = =wall_line_width_0 + wall_line_width_x +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg index 21e814e112..74a80d566c 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = AA+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg index f52cdf8124..33fd2b9d8b 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = AA+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg index 8332ecacbc..5c8d802225 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = AA+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg index 4c4490876f..ecd6554ecb 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = AA+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg index ae38c02395..d671176cbd 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg @@ -16,7 +16,13 @@ cool_min_layer_time = 5 cool_min_layer_time_overhang = 9 cool_min_speed = 6 cool_min_temperature = =material_print_temperature - 15 +gradual_flow_enable = False +hole_xy_offset = 0.075 +inset_direction = outside_in +speed_wall = =speed_print speed_wall_x = =speed_print speed_wall_x_roofing = =speed_wall wall_line_width_x = =wall_line_width +wall_thickness = =wall_line_width_0 + wall_line_width_x +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg index 484b9536a6..11761903ee 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = AA+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg index 4509317076..0fe6907cc3 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg @@ -16,7 +16,13 @@ cool_min_layer_time = 5 cool_min_layer_time_overhang = 9 cool_min_speed = 6 cool_min_temperature = =material_print_temperature - 15 +gradual_flow_enable = False +hole_xy_offset = 0.075 +inset_direction = outside_in +speed_wall = =speed_print speed_wall_x = =speed_print speed_wall_x_roofing = =speed_wall wall_line_width_x = =wall_line_width +wall_thickness = =wall_line_width_0 + wall_line_width_x +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg index c5b81e4a4c..8e88841ec1 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = AA+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg index 4f75b631df..f39d44f4f8 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg @@ -16,7 +16,13 @@ cool_min_layer_time = 5 cool_min_layer_time_overhang = 9 cool_min_speed = 6 cool_min_temperature = =material_print_temperature - 15 +gradual_flow_enable = False +hole_xy_offset = 0.075 +inset_direction = outside_in +speed_wall = =speed_print speed_wall_x = =speed_print speed_wall_x_roofing = =speed_wall wall_line_width_x = =wall_line_width +wall_thickness = =wall_line_width_0 + wall_line_width_x +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..cbd6179e03 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_nylon-cf-slide +quality_type = draft +setting_version = 25 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm_annealing.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm_annealing.inst.cfg new file mode 100644 index 0000000000..e2992cfa3a --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm_annealing.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Annealing +version = 4 + +[metadata] +intent_category = annealing +is_experimental = True +material = generic_petcf +quality_type = fast +setting_version = 25 +type = intent +variant = CC 0.4 + +[values] +infill_sparse_density = 100 +jerk_print = 6000 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.9 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_enable = True +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..d64f90fdc6 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_petcf +quality_type = fast +setting_version = 25 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 25 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm_annealing.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm_annealing.inst.cfg new file mode 100644 index 0000000000..631118717c --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm_annealing.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Annealing +version = 4 + +[metadata] +intent_category = annealing +is_experimental = True +material = generic_petcf +quality_type = draft +setting_version = 25 +type = intent +variant = CC 0.4 + +[values] +infill_sparse_density = 100 +jerk_print = 6000 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.9 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_enable = True +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..4c551f588e --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_petcf +quality_type = draft +setting_version = 25 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 20 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..5bebb643ec --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_nylon-cf-slide +quality_type = draft +setting_version = 25 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm_annealing.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm_annealing.inst.cfg new file mode 100644 index 0000000000..7a2cff4ef5 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm_annealing.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Annealing +version = 4 + +[metadata] +intent_category = annealing +is_experimental = True +material = generic_petcf +quality_type = fast +setting_version = 25 +type = intent +variant = CC 0.6 + +[values] +infill_sparse_density = 100 +jerk_print = 6000 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.9 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_enable = True +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..d1fffb7b9d --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_petcf +quality_type = fast +setting_version = 25 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 25 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm_annealing.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm_annealing.inst.cfg new file mode 100644 index 0000000000..2330d0f32b --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm_annealing.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Annealing +version = 4 + +[metadata] +intent_category = annealing +is_experimental = True +material = generic_petcf +quality_type = draft +setting_version = 25 +type = intent +variant = CC 0.6 + +[values] +infill_sparse_density = 100 +jerk_print = 6000 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.9 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_enable = True +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..fe18b8ecba --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm_engineering.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_petcf +quality_type = draft +setting_version = 25 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 6000 +speed_infill = =speed_print +speed_print = 25 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg index 832912a022..aad54ac9d7 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg @@ -13,7 +13,10 @@ type = intent variant = CC+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg index a0e65969e9..9892f6b555 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -13,7 +13,10 @@ type = intent variant = CC+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg index f40d2509b6..18ff3a861b 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg @@ -13,7 +13,10 @@ type = intent variant = CC+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg index 824018a1d5..f41bf80386 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg @@ -13,7 +13,10 @@ type = intent variant = CC+ 0.4 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg index 8cbb513108..cb43ac7cfa 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = CC+ 0.6 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg index 5384f380ac..0ecb4c3a61 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg @@ -12,7 +12,10 @@ type = intent variant = CC+ 0.6 [values] +hole_xy_offset = 0.075 infill_sparse_density = 20 +inset_direction = outside_in top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 4 +xy_offset = 0.075 diff --git a/resources/meshes/anycubic_kobra_s1_buildplate.obj b/resources/meshes/anycubic_kobra_s1_buildplate.obj new file mode 100644 index 0000000000..c206e9d45d --- /dev/null +++ b/resources/meshes/anycubic_kobra_s1_buildplate.obj @@ -0,0 +1,917 @@ +# Blender 4.5.2 LTS +# www.blender.org +mtllib anycubic_kobra_s1_buildplate.mtl +o anycubic_kobra_s1_buildplate +v -129.054123 -130.091019 -0.700027 +v -131.999741 -125.129326 -0.700027 +v 24.434870 -134.329071 -0.699997 +v 17.018261 -141.131271 -0.700027 +v 17.993422 -138.654526 -0.700017 +v 17.573563 -138.625687 -0.700039 +v 7.467300 -130.848297 -0.700027 +v 10.650862 -131.688293 -0.700024 +v 10.835647 -131.177765 -0.700052 +v 10.634915 -131.406662 -0.700027 +v 28.897467 -129.170013 -0.700027 +v 129.731293 -141.134842 -0.700027 +v 28.763437 -139.157059 -0.700023 +v 19.657635 1.777050 -0.700027 +v 130.689468 -140.855942 -0.700027 +v -126.003876 134.864807 -0.700027 +v 94.529488 119.736588 -0.700027 +v -127.664345 134.508484 -0.700027 +v -53.626228 131.701767 -0.700027 +v -58.244865 131.375092 -0.700011 +v -56.412327 131.738388 -0.700027 +v -58.738430 134.509171 -0.700027 +v -51.261589 134.509155 -0.700027 +v 59.504433 134.866333 -0.700027 +v 58.738407 134.509140 -0.700027 +v 56.373764 131.701767 -0.700027 +v 129.054123 133.823685 -0.700027 +v 6.849222 -131.822647 -0.700027 +v 5.973866 -131.306747 -0.700027 +v -125.937408 -131.133133 -0.700027 +v 16.145327 -140.860641 -0.700027 +v 15.498124 -140.467697 -0.700027 +v 19.726137 -139.083862 -0.699903 +v 19.846451 -139.155289 -0.699967 +v 19.694454 -138.804977 -0.700012 +v 19.672100 -138.985672 -0.699999 +v 17.791988 -138.688354 -0.699921 +v 24.677004 -131.159836 -0.700026 +v 5.082874 -131.134628 -0.700027 +v -131.642151 -126.798012 -0.700027 +v -130.345932 -128.984650 -0.700027 +v -131.129166 -127.883667 -0.700027 +v -127.521126 -130.824478 -0.700027 +v 24.189461 -134.309204 -0.699963 +v 28.900984 -139.058914 -0.699964 +v 28.937689 -138.922531 -0.699970 +v 131.429153 -140.236237 -0.700027 +v 131.829224 -139.561752 -0.700027 +v 131.999878 -138.837708 -0.700027 +v 24.932178 -131.709625 -0.699983 +v 24.986902 -131.483047 -0.700003 +v 24.872414 -131.261368 -0.700028 +v -131.972137 129.010681 -0.700027 +v -131.690811 130.387451 -0.700027 +v -129.850983 133.212265 -0.700027 +v -130.957367 131.920441 -0.700027 +v -59.504433 134.866333 -0.700027 +v -55.206390 131.169067 -0.700027 +v -54.353245 131.252808 -0.700027 +v -55.876461 131.360275 -0.700027 +v -61.206200 131.340363 -0.699992 +v -61.103699 131.284119 -0.700031 +v -58.337986 131.290283 -0.700022 +v -61.257591 131.533386 -0.700020 +v -60.041721 132.993088 -0.699486 +v -59.706219 133.092285 -0.699463 +v -59.445782 133.003464 -0.699889 +v -128.750000 133.995499 -0.700027 +v -58.214905 131.529205 -0.699996 +v -59.081882 134.772491 -0.700027 +v -50.918118 134.772491 -0.700027 +v 54.123543 131.360275 -0.700027 +v 54.793610 131.169067 -0.700027 +v 55.646759 131.252808 -0.700027 +v -50.495571 134.866333 -0.700027 +v 58.372162 131.283875 -0.700029 +v 61.090813 131.281311 -0.700040 +v 61.215893 131.350204 -0.699977 +v 131.996445 128.883270 -0.700027 +v 131.642151 130.530670 -0.700027 +v 53.603378 131.725235 -0.700027 +v 50.495571 134.866333 -0.700027 +v 59.437256 133.000992 -0.699896 +v 50.918118 134.772491 -0.700027 +v 51.261566 134.509171 -0.700027 +v 59.081882 134.772491 -0.700027 +v 59.768948 133.092285 -0.699463 +v 61.261791 131.523209 -0.699989 +v 60.038094 132.999237 -0.699867 +v 130.345932 132.717316 -0.700027 +v 131.129166 131.616333 -0.700027 +v 125.947678 134.864441 -0.700027 +v 127.521126 134.557144 -0.700027 +v 15.477744 -140.445251 -0.000027 +v 6.921199 -131.894821 -0.000027 +v 6.172548 -131.389053 -0.000027 +v 5.182955 -131.133942 -0.000027 +v -126.021477 -131.129410 -0.000027 +v -127.664345 -130.775818 -0.000027 +v -128.750000 -130.262833 -0.000027 +v -129.850983 -129.479599 -0.000027 +v -130.957352 -128.187790 -0.000027 +v -131.690811 -126.654793 -0.000027 +v -131.999237 -125.072853 -0.000027 +v -131.999634 128.862701 -0.000027 +v -131.642151 130.530670 -0.000027 +v -131.129166 131.616333 -0.000027 +v -130.345932 132.717316 -0.000027 +v -129.054123 133.823685 -0.000027 +v -127.521126 134.557144 -0.000027 +v -125.943855 134.864960 -0.000027 +v -59.504433 134.866333 -0.000027 +v -59.081867 134.772491 -0.000027 +v -58.738400 134.509140 -0.000027 +v -56.382183 131.713150 -0.000027 +v -55.646759 131.252808 -0.000027 +v -54.793610 131.169067 -0.000027 +v -54.123543 131.360275 -0.000027 +v -53.588142 131.744583 -0.000027 +v -51.261597 134.509155 -0.000027 +v -50.918118 134.772491 -0.000027 +v -50.495571 134.866333 -0.000027 +v 50.495571 134.866333 -0.000027 +v 50.918118 134.772491 -0.000027 +v 53.590721 131.735840 -0.000027 +v 51.261597 134.509155 -0.000027 +v 54.353245 131.252808 -0.000027 +v 55.206390 131.169067 -0.000027 +v 55.876461 131.360275 -0.000027 +v 56.411842 131.744568 -0.000027 +v 58.738411 134.509155 -0.000027 +v 59.081882 134.772491 -0.000027 +v 126.004631 134.864685 -0.000027 +v 59.504433 134.866333 -0.000027 +v 127.664345 134.508484 -0.000027 +v 128.750000 133.995499 -0.000027 +v 129.850983 133.212265 -0.000027 +v 130.957367 131.920441 -0.000027 +v 131.690811 130.387451 -0.000027 +v 131.998947 128.807678 -0.000027 +v 131.999741 -138.838501 -0.000027 +v 131.720840 -139.824554 -0.000027 +v 131.101089 -140.564301 -0.000027 +v 130.426453 -140.964417 -0.000027 +v 129.667175 -141.134506 -0.000027 +v 17.248808 -141.134827 -0.000027 +v 16.351576 -140.962082 -0.000027 +v 19.707363 -138.788864 -0.000041 +v 24.162891 -134.333496 -0.000053 +v 19.663969 -138.943939 -0.000087 +v 19.797115 -139.148376 -0.000032 +v 28.767149 -139.155899 -0.000027 +v 28.914742 -139.033264 -0.000058 +v 28.935387 -138.848969 -0.000056 +v 28.901199 -138.794693 -0.699900 +v 24.398291 -134.300629 -0.000029 +v 17.543394 -138.596664 -0.000027 +v 10.667012 -131.718216 -0.000029 +v 17.720654 -138.684357 -0.000258 +v 18.011297 -138.637558 -0.000064 +v 24.922869 -131.725021 -0.000033 +v 24.982822 -131.458267 -0.000442 +v 24.862761 -131.252243 -0.000026 +v 24.679277 -131.160583 -0.000028 +v 10.902476 -131.165527 -0.000039 +v 10.718793 -131.272064 -0.000636 +v 10.623919 -131.451797 -0.000026 +v 61.245735 131.562759 -0.000011 +v 61.253937 131.430710 0.000029 +v 61.149254 131.294632 -0.000034 +v 60.027687 133.012787 -0.000037 +v 59.431732 132.991699 -0.000385 +v 59.678104 133.087860 -0.000445 +v 58.228245 131.561798 -0.000019 +v 58.211628 131.530136 -0.699993 +v 58.355827 131.286514 -0.000025 +v 58.224735 131.394821 -0.000031 +v 58.258984 131.349060 -0.699994 +v -58.215385 131.472092 -0.000096 +v -58.242355 131.581573 -0.000025 +v -58.251167 131.362717 -0.000042 +v -58.354370 131.287048 -0.000028 +v -59.444996 133.012695 -0.000070 +v -60.042431 132.997391 -0.000213 +v -59.797066 133.087875 -0.000445 +v -61.231110 131.585205 -0.000019 +v -61.179737 131.318527 -0.000114 +v -61.088017 131.281326 -0.000014 +v -61.257828 131.433472 0.000060 +v -27.913065 -9.021112 -0.000027 +v -96.694077 101.654877 -0.000027 +v 7.098911 -130.230896 -0.000027 +v 25.810665 -131.897369 -0.000027 +v 31.053526 -138.925018 -0.000027 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 -0.0001 -1.0000 +vn -0.0003 0.0004 -1.0000 +vn 0.0006 -0.0007 -1.0000 +vn 0.0001 -0.0001 -1.0000 +vn 0.0005 -0.0001 -1.0000 +vn -0.0005 0.0002 -1.0000 +vn -0.0000 0.0006 -1.0000 +vn -0.0020 -0.0000 -1.0000 +vn -0.0001 0.0001 -1.0000 +vn -0.0000 0.0008 -1.0000 +vn 0.0001 -0.0000 -1.0000 +vn 0.0012 -0.0006 -1.0000 +vn 0.0002 -0.0003 -1.0000 +vn -0.0017 -0.0001 -1.0000 +vn -0.0000 0.0001 -1.0000 +vn -0.0001 -0.0001 -1.0000 +vn 0.0002 0.0008 -1.0000 +vn 0.0002 0.0006 -1.0000 +vn 0.0012 0.0005 -1.0000 +vn -0.0017 -0.0006 -1.0000 +vn 0.0001 -0.0003 -1.0000 +vn -0.7069 -0.7074 -0.0003 +vn -0.7069 -0.7073 0.0021 +vn -0.5073 -0.8607 0.0428 +vn -0.5596 -0.8283 -0.0279 +vn -0.1896 -0.9815 0.0281 +vn -0.2494 -0.9674 -0.0430 +vn -0.0000 -1.0000 0.0053 +vn -0.0000 -1.0000 0.0009 +vn -0.2103 -0.9773 0.0249 +vn -0.1913 -0.9814 -0.0177 +vn -0.4269 -0.9036 -0.0363 +vn -0.4314 -0.9018 -0.0256 +vn -0.5789 -0.8137 0.0518 +vn -0.6486 -0.7573 -0.0768 +vn -0.8138 -0.5789 -0.0518 +vn -0.9018 -0.4314 0.0256 +vn -0.9036 -0.4269 0.0363 +vn -0.9814 -0.1913 0.0161 +vn -0.9775 -0.2095 -0.0251 +vn -0.7573 -0.6486 0.0768 +vn -0.9992 0.0001 -0.0392 +vn -1.0000 -0.0000 0.0007 +vn -0.9775 0.2095 0.0251 +vn -0.9797 0.2002 0.0038 +vn -0.9036 0.4269 -0.0363 +vn -0.9018 0.4314 -0.0256 +vn -0.8137 0.5789 0.0518 +vn -0.7573 0.6486 -0.0769 +vn -0.5789 0.8137 -0.0518 +vn -0.4314 0.9018 0.0256 +vn -0.4269 0.9036 0.0363 +vn -0.1915 0.9814 0.0162 +vn -0.2098 0.9774 -0.0250 +vn -0.6486 0.7573 0.0768 +vn -0.0000 1.0000 -0.0000 +vn -0.0000 1.0000 -0.0002 +vn 0.2168 0.9762 -0.0000 +vn 0.6085 0.7936 0.0001 +vn 0.6084 0.7936 -0.0000 +vn 0.7659 0.6430 -0.0000 +vn 0.7646 0.6444 -0.0097 +vn 0.5765 0.8171 0.0046 +vn 0.5301 0.8468 -0.0439 +vn 0.2739 0.9600 0.0575 +vn 0.0975 0.9936 -0.0575 +vn -0.0975 0.9936 0.0575 +vn -0.2740 0.9600 -0.0575 +vn -0.5250 0.8501 0.0418 +vn -0.5830 0.8123 -0.0180 +vn -0.7648 0.6442 0.0022 +vn -0.7651 0.6439 -0.0000 +vn -0.2168 0.9762 -0.0000 +vn -0.6085 0.7936 -0.0000 +vn -0.6084 0.7936 -0.0000 +vn 0.6085 0.7936 -0.0000 +vn 0.7653 0.6437 0.0041 +vn 0.7658 0.6431 -0.0000 +vn 0.5743 0.8186 -0.0020 +vn 0.5346 0.8439 -0.0458 +vn 0.2740 0.9600 0.0575 +vn -0.2739 0.9600 -0.0575 +vn -0.6084 0.7936 -0.0001 +vn -0.0000 1.0000 -0.0004 +vn 0.2098 0.9774 0.0250 +vn 0.1917 0.9813 -0.0159 +vn 0.4269 0.9036 -0.0363 +vn 0.4314 0.9018 -0.0256 +vn 0.5789 0.8137 0.0518 +vn 0.6486 0.7573 -0.0768 +vn 0.8137 0.5789 -0.0518 +vn 0.9018 0.4314 0.0256 +vn 0.9036 0.4269 0.0363 +vn 0.9814 0.1914 0.0172 +vn 0.9773 0.2102 -0.0249 +vn 0.7573 0.6486 0.0768 +vn 1.0000 -0.0000 0.0002 +vn 1.0000 -0.0000 -0.0036 +vn 0.9612 -0.2719 0.0468 +vn 0.9733 -0.2294 -0.0001 +vn 0.8586 -0.5093 -0.0583 +vn 0.7652 -0.6411 0.0582 +vn 0.6411 -0.7652 -0.0582 +vn 0.5092 -0.8587 0.0583 +vn 0.2186 -0.9756 0.0204 +vn 0.2792 -0.9592 -0.0437 +vn -0.0000 -1.0000 -0.0050 +vn -0.0000 -1.0000 0.0004 +vn -0.1887 -0.9804 0.0572 +vn -0.2957 -0.9539 -0.0511 +vn -0.5090 -0.8607 0.0128 +vn -0.5188 -0.8544 0.0290 +vn 0.7072 -0.7070 0.0023 +vn 0.7071 -0.7071 0.0032 +vn 0.5103 0.8596 0.0275 +vn 0.8759 0.4821 -0.0186 +vn 0.9923 -0.1228 0.0189 +vn 0.9629 -0.2695 -0.0116 +vn 0.8374 0.5454 -0.0347 +vn 0.0002 1.0000 -0.0099 +vn 0.0008 1.0000 -0.0016 +vn -0.5808 0.8140 0.0018 +vn -0.9937 0.1113 -0.0150 +vn -0.9656 0.2599 0.0095 +vn -0.9613 -0.2744 0.0257 +vn -0.6390 0.7690 -0.0157 +vn -0.7070 -0.7071 -0.0082 +vn -0.7078 -0.7061 -0.0201 +vn -0.0806 -0.9961 0.0363 +vn 0.1382 -0.9900 -0.0291 +vn 0.7072 0.7070 0.0012 +vn 0.7078 0.7063 0.0139 +vn 0.2757 0.9610 0.0226 +vn 0.4433 0.8962 -0.0181 +vn -0.1656 0.9859 -0.0225 +vn -0.1589 0.9871 -0.0199 +vn -0.7072 0.7071 0.0009 +vn -0.7074 0.7068 0.0062 +vn -0.9720 0.2347 -0.0140 +vn -0.9756 0.2193 -0.0082 +vn -0.8885 -0.4588 0.0111 +vn -0.8640 -0.5035 -0.0053 +vn -0.4611 -0.8874 0.0052 +vn -0.4469 -0.8946 0.0005 +vn 0.0004 -0.9998 0.0175 +vn 0.0013 -1.0000 -0.0011 +vn 0.5015 -0.8645 -0.0328 +vn 0.7513 -0.6589 0.0367 +vn 0.9982 0.0565 0.0193 +vn 0.8842 -0.4668 -0.0162 +vn 0.9870 0.1597 -0.0160 +vn -0.9979 -0.0621 -0.0194 +vn -0.9663 0.2563 0.0230 +vn -0.7923 0.6096 -0.0270 +vn -0.4824 0.8757 0.0236 +vn -0.7657 -0.6432 0.0011 +vn -0.7697 -0.6381 0.0184 +vn 0.3636 -0.9315 -0.0095 +vn -0.2098 -0.9772 -0.0334 +vn 0.2652 -0.9638 0.0284 +vn -0.3267 -0.9450 0.0134 +vn 0.7682 -0.6401 0.0107 +vn 0.7651 -0.6439 -0.0025 +vn 0.6368 0.7708 -0.0192 +vn 0.4990 0.8665 0.0084 +vn 0.9995 -0.0210 -0.0228 +vn 0.9670 0.2529 0.0308 +vn 0.0009 1.0000 -0.0037 +vn -0.0029 0.9998 -0.0188 +vn -0.9815 0.1908 0.0149 +vn -0.5913 0.8064 -0.0101 +vn -0.6733 0.7393 0.0070 +vn -0.9708 -0.2391 -0.0202 +vn -0.9504 0.3109 -0.0031 +vn -0.7654 -0.6432 0.0181 +vn -0.7676 -0.6409 0.0093 +vn 0.3460 -0.9382 0.0061 +vn -0.2087 -0.9774 -0.0333 +vn 0.2834 -0.9585 0.0308 +vn -0.3227 -0.9464 0.0128 +vn 0.7650 -0.6440 0.0047 +vn 0.7682 -0.6399 0.0183 +vn 0.3758 0.9267 -0.0047 +vn 0.8271 0.5619 -0.0138 +vn 0.4810 0.8767 0.0092 +vn 0.9846 -0.1733 -0.0244 +vn 0.9657 0.2571 0.0370 +vn -0.0021 1.0000 0.0046 +vn -0.0022 1.0000 0.0041 +vn -0.0000 -0.0000 1.0000 +vn -0.0001 0.0002 1.0000 +vn 0.0002 -0.0004 1.0000 +vn -0.0008 0.0006 1.0000 +vn 0.0010 -0.0005 1.0000 +vn 0.0010 0.0029 1.0000 +vn -0.0010 -0.0039 1.0000 +vn -0.0005 0.0006 1.0000 +vn 0.0008 -0.0010 1.0000 +vn -0.0007 0.0009 1.0000 +vn -0.0001 0.0003 1.0000 +vn -0.0001 0.0005 1.0000 +vn -0.0000 -0.0006 1.0000 +vn -0.0001 -0.0000 1.0000 +vn 0.0008 -0.0005 1.0000 +vn 0.0012 -0.0008 1.0000 +vn -0.0010 0.0002 1.0000 +vn -0.0000 0.0003 1.0000 +vn -0.0000 0.0004 1.0000 +vn -0.0001 0.0001 1.0000 +vn 0.0003 0.0015 1.0000 +vn -0.0023 -0.0033 1.0000 +vn -0.0000 -0.0001 1.0000 +vn -0.0000 0.0001 1.0000 +vn -0.0000 -0.0005 1.0000 +vn 0.0004 -0.0001 1.0000 +vn -0.0014 -0.0012 1.0000 +vn 0.0003 -0.0001 1.0000 +vt 0.000000 0.000000 +vt 0.000107 0.058203 +vt 0.016454 0.037622 +vt 0.394244 0.478671 +vt 0.016996 0.998790 +vt 0.001448 0.984261 +vt 0.000121 0.978240 +vt 0.133726 0.879669 +vt 0.286443 0.988604 +vt 0.276187 0.999660 +vt 0.279358 0.988093 +vt 0.540230 0.035080 +vt 0.526857 0.039508 +vt 0.540433 0.034155 +vt 0.574484 0.007985 +vt 0.561949 0.000747 +vt 0.565302 0.000027 +vt 0.597730 0.033470 +vt 0.999878 0.008326 +vt 0.720558 0.987447 +vt 0.713609 0.988715 +vt 0.991098 0.000046 +vt 0.998752 0.004815 +vt 0.012310 0.039392 +vt 0.008205 0.042301 +vt 0.519592 0.036165 +vt 0.022652 0.036358 +vt 0.004032 0.046963 +vt 0.001265 0.052495 +vt 0.558636 0.002548 +vt 0.526167 0.033461 +vt 0.566417 0.009197 +vt 0.574994 0.007280 +vt 0.574631 0.008489 +vt 0.567037 0.008919 +vt 0.568114 0.009061 +vt 0.523292 0.035196 +vt 0.540622 0.035760 +vt 0.541267 0.036099 +vt 0.593443 0.036109 +vt 0.022945 0.999896 +vt 0.003298 0.988224 +vt 0.006339 0.992151 +vt 0.011213 0.996143 +vt 0.268058 0.988106 +vt 0.267978 0.987584 +vt 0.268216 0.987186 +vt 0.274587 1.000000 +vt 0.278953 0.987065 +vt 0.268591 0.987023 +vt 0.279330 0.987333 +vt 0.279457 0.987685 +vt 0.289243 0.987038 +vt 0.292425 0.986655 +vt 0.294945 0.987343 +vt 0.296968 0.988715 +vt 0.274751 0.993207 +vt 0.272600 0.993165 +vt 0.277488 0.998706 +vt 0.273704 0.993558 +vt 0.308709 1.000000 +vt 0.305808 0.998706 +vt 0.307109 0.999660 +vt 0.608914 0.007209 +vt 0.617588 0.008008 +vt 0.609438 0.007577 +vt 0.609480 0.008255 +vt 0.592353 0.024675 +vt 0.591541 0.024638 +vt 0.594342 0.034112 +vt 0.594123 0.035786 +vt 0.594533 0.035019 +vt 0.996497 0.002108 +vt 0.993956 0.000667 +vt 0.694129 0.998706 +vt 0.709065 0.986656 +vt 0.705884 0.987038 +vt 0.711585 0.987343 +vt 0.702989 0.988695 +vt 0.720555 0.988028 +vt 0.720989 0.987063 +vt 0.999829 0.978042 +vt 0.731580 0.987122 +vt 0.731963 0.987555 +vt 0.731920 0.988003 +vt 0.691227 1.000000 +vt 0.692828 0.999660 +vt 0.722448 0.998706 +vt 0.724957 0.993040 +vt 0.727273 0.993212 +vt 0.723749 0.999660 +vt 0.725349 1.000000 +vt 0.726232 0.993558 +vt 0.977220 0.999882 +vt 0.983483 0.998614 +vt 0.998672 0.983742 +vt 0.995905 0.989274 +vt 0.991731 0.993936 +vt 0.987626 0.996845 +s 0 +usemtl Material.002 +f 2/1/1 1/1/1 40/1/1 +f 14/1/1 9/1/1 7/1/1 +f 10/1/1 8/1/1 7/1/1 +f 14/1/1 20/1/1 21/1/1 +f 25/1/1 175/1/1 26/1/1 +f 26/1/1 76/1/1 17/1/1 +f 26/1/1 17/1/1 14/1/1 +f 29/1/1 7/1/1 28/1/1 +f 6/1/1 28/1/1 7/1/1 +f 7/1/2 9/1/2 10/1/2 +f 4/1/1 31/1/1 32/1/1 +f 4/1/3 33/1/3 34/1/3 +f 36/1/4 33/1/4 4/1/4 +f 4/1/5 35/1/5 36/1/5 +f 4/1/6 6/1/6 37/1/6 +f 6/1/1 4/1/1 32/1/1 +f 32/1/1 28/1/1 6/1/1 +f 14/1/1 38/1/1 9/1/1 +f 6/1/1 7/1/1 8/1/1 +f 5/1/7 4/1/7 37/1/7 +f 5/1/1 35/1/1 4/1/1 +f 39/1/1 7/1/1 29/1/1 +f 40/1/1 41/1/1 42/1/1 +f 1/1/1 30/1/1 43/1/1 +f 40/1/1 1/1/1 41/1/1 +f 2/1/1 14/1/1 1/1/1 +f 30/1/1 14/1/1 39/1/1 +f 30/1/1 1/1/1 14/1/1 +f 14/1/1 7/1/1 39/1/1 +f 14/1/1 11/1/1 38/1/1 +f 34/1/1 13/1/1 4/1/1 +f 12/1/1 4/1/1 13/1/1 +f 11/1/1 155/1/1 3/1/1 +f 44/1/1 35/1/1 5/1/1 +f 13/1/8 45/1/8 12/1/8 +f 12/1/1 46/1/1 11/1/1 +f 12/1/1 45/1/1 46/1/1 +f 11/1/9 46/1/9 155/1/9 +f 12/1/1 14/1/1 15/1/1 +f 47/1/1 15/1/1 48/1/1 +f 49/1/1 48/1/1 15/1/1 +f 14/1/1 49/1/1 15/1/1 +f 14/1/1 12/1/1 11/1/1 +f 50/1/1 11/1/1 5/1/1 +f 11/1/10 3/1/10 44/1/10 +f 5/1/2 11/1/2 44/1/2 +f 11/1/5 50/1/5 51/1/5 +f 51/1/2 52/1/2 11/1/2 +f 52/1/1 38/1/1 11/1/1 +f 16/1/1 14/1/1 2/1/1 +f 54/1/1 16/1/1 53/1/1 +f 16/1/1 54/1/1 56/1/1 +f 2/1/1 53/1/1 16/1/1 +f 14/1/1 16/1/1 62/1/1 +f 61/1/11 62/1/11 16/1/11 +f 62/1/1 63/1/1 14/1/1 +f 14/1/1 58/1/1 59/1/1 +f 58/1/1 14/1/1 60/1/1 +f 14/1/12 63/1/12 20/1/12 +f 56/1/1 55/1/1 16/1/1 +f 55/1/1 18/1/1 16/1/1 +f 64/1/13 57/1/13 65/1/13 +f 65/1/14 57/1/14 66/1/14 +f 57/1/15 67/1/15 66/1/15 +f 64/1/1 16/1/1 57/1/1 +f 55/1/1 68/1/1 18/1/1 +f 69/1/16 21/1/16 20/1/16 +f 57/1/17 21/1/17 67/1/17 +f 21/1/16 69/1/16 67/1/16 +f 14/1/1 21/1/1 60/1/1 +f 59/1/1 19/1/1 14/1/1 +f 14/1/1 19/1/1 23/1/1 +f 21/1/1 57/1/1 22/1/1 +f 70/1/1 22/1/1 57/1/1 +f 71/1/1 75/1/1 14/1/1 +f 71/1/1 14/1/1 23/1/1 +f 16/1/2 64/1/2 61/1/2 +f 14/1/1 75/1/1 82/1/1 +f 14/1/1 74/1/1 26/1/1 +f 17/1/1 24/1/1 92/1/1 +f 14/1/1 73/1/1 74/1/1 +f 73/1/1 14/1/1 72/1/1 +f 76/1/18 26/1/18 178/1/18 +f 76/1/1 77/1/1 17/1/1 +f 77/1/19 78/1/19 17/1/19 +f 14/1/1 17/1/1 49/1/1 +f 17/1/1 79/1/1 49/1/1 +f 79/1/1 17/1/1 27/1/1 +f 79/1/1 27/1/1 80/1/1 +f 14/1/1 81/1/1 72/1/1 +f 175/1/1 178/1/1 26/1/1 +f 175/1/12 25/1/12 83/1/12 +f 84/1/1 85/1/1 14/1/1 +f 84/1/1 14/1/1 82/1/1 +f 25/1/1 86/1/1 24/1/1 +f 14/1/1 85/1/1 81/1/1 +f 83/1/20 25/1/20 87/1/20 +f 88/1/2 17/1/2 78/1/2 +f 89/1/21 87/1/21 24/1/21 +f 88/1/16 89/1/16 17/1/16 +f 89/1/2 24/1/2 17/1/2 +f 80/1/1 27/1/1 91/1/1 +f 90/1/1 91/1/1 27/1/1 +f 27/1/1 92/1/1 93/1/1 +f 17/1/1 92/1/1 27/1/1 +f 24/1/22 87/1/22 25/1/22 +f 95/1/23 28/1/23 94/1/23 +f 28/1/24 32/1/24 94/1/24 +f 29/1/25 28/1/25 96/1/25 +f 28/1/26 95/1/26 96/1/26 +f 39/1/27 29/1/27 97/1/27 +f 29/1/28 96/1/28 97/1/28 +f 30/1/29 97/1/29 98/1/29 +f 39/1/30 97/1/30 30/1/30 +f 98/1/31 99/1/31 43/1/31 +f 98/1/32 43/1/32 30/1/32 +f 99/1/33 100/1/33 1/1/33 +f 99/1/34 1/1/34 43/1/34 +f 100/1/35 101/1/35 1/1/35 +f 41/1/36 1/1/36 101/1/36 +f 102/1/37 42/1/37 41/1/37 +f 102/1/38 103/1/38 40/1/38 +f 102/1/39 40/1/39 42/1/39 +f 103/1/40 104/1/40 2/1/40 +f 103/1/41 2/1/41 40/1/41 +f 41/1/42 101/1/42 102/1/42 +f 2/1/43 105/1/43 53/1/43 +f 2/1/44 104/1/44 105/1/44 +f 105/1/45 106/1/45 54/1/45 +f 105/1/46 54/1/46 53/1/46 +f 106/1/47 107/1/47 56/1/47 +f 106/1/48 56/1/48 54/1/48 +f 107/1/49 108/1/49 56/1/49 +f 55/1/50 56/1/50 108/1/50 +f 109/1/51 68/1/51 55/1/51 +f 109/1/52 110/1/52 18/1/52 +f 109/1/53 18/1/53 68/1/53 +f 110/1/54 111/1/54 16/1/54 +f 110/1/55 16/1/55 18/1/55 +f 55/1/56 108/1/56 109/1/56 +f 112/1/57 57/1/57 16/1/57 +f 112/1/58 16/1/58 111/1/58 +f 113/1/59 70/1/59 57/1/59 +f 113/1/59 57/1/59 112/1/59 +f 22/1/60 113/1/60 114/1/60 +f 113/1/61 22/1/61 70/1/61 +f 114/1/62 21/1/62 22/1/62 +f 114/1/63 115/1/63 21/1/63 +f 60/1/64 21/1/64 115/1/64 +f 60/1/65 115/1/65 116/1/65 +f 58/1/66 60/1/66 116/1/66 +f 58/1/67 116/1/67 117/1/67 +f 59/1/68 58/1/68 117/1/68 +f 59/1/69 117/1/69 118/1/69 +f 19/1/70 59/1/70 118/1/70 +f 19/1/71 118/1/71 119/1/71 +f 23/1/72 19/1/72 119/1/72 +f 23/1/73 119/1/73 120/1/73 +f 71/1/74 121/1/74 122/1/74 +f 71/1/74 122/1/74 75/1/74 +f 120/1/75 71/1/75 23/1/75 +f 71/1/76 120/1/76 121/1/76 +f 82/1/57 122/1/57 123/1/57 +f 82/1/57 75/1/57 122/1/57 +f 82/1/59 123/1/59 124/1/59 +f 84/1/59 82/1/59 124/1/59 +f 124/1/61 126/1/61 84/1/61 +f 126/1/77 85/1/77 84/1/77 +f 81/1/78 85/1/78 125/1/78 +f 126/1/79 125/1/79 85/1/79 +f 72/1/80 81/1/80 125/1/80 +f 72/1/81 125/1/81 127/1/81 +f 73/1/67 127/1/67 128/1/67 +f 74/1/68 73/1/68 128/1/68 +f 73/1/82 72/1/82 127/1/82 +f 26/1/70 74/1/70 129/1/70 +f 26/1/71 129/1/71 130/1/71 +f 74/1/83 128/1/83 129/1/83 +f 25/1/72 26/1/72 130/1/72 +f 25/1/73 130/1/73 131/1/73 +f 86/1/74 132/1/74 24/1/74 +f 24/1/74 132/1/74 134/1/74 +f 25/1/84 131/1/84 132/1/84 +f 86/1/75 25/1/75 132/1/75 +f 92/1/85 24/1/85 133/1/85 +f 133/1/57 24/1/57 134/1/57 +f 133/1/86 135/1/86 93/1/86 +f 133/1/87 93/1/87 92/1/87 +f 135/1/88 136/1/88 27/1/88 +f 135/1/89 27/1/89 93/1/89 +f 136/1/90 137/1/90 27/1/90 +f 90/1/91 27/1/91 137/1/91 +f 138/1/92 91/1/92 90/1/92 +f 138/1/93 139/1/93 80/1/93 +f 138/1/94 80/1/94 91/1/94 +f 139/1/95 140/1/95 79/1/95 +f 139/1/96 79/1/96 80/1/96 +f 90/1/97 137/1/97 138/1/97 +f 49/1/98 140/1/98 141/1/98 +f 79/1/99 140/1/99 49/1/99 +f 141/1/100 142/1/100 48/1/100 +f 141/1/101 48/1/101 49/1/101 +f 142/1/102 47/1/102 48/1/102 +f 47/1/103 142/1/103 143/1/103 +f 143/1/104 15/1/104 47/1/104 +f 143/1/105 144/1/105 15/1/105 +f 144/1/106 145/1/106 12/1/106 +f 144/1/107 12/1/107 15/1/107 +f 12/1/108 146/1/108 4/1/108 +f 145/1/109 146/1/109 12/1/109 +f 146/1/110 147/1/110 4/1/110 +f 31/1/111 4/1/111 147/1/111 +f 147/1/112 94/1/112 32/1/112 +f 147/1/113 32/1/113 31/1/113 +f 35/1/114 44/1/114 149/1/114 +f 35/1/115 149/1/115 148/1/115 +f 34/1/116 33/1/116 151/1/116 +f 33/1/117 36/1/117 150/1/117 +f 36/1/118 35/1/118 150/1/118 +f 35/1/119 148/1/119 150/1/119 +f 150/1/120 151/1/120 33/1/120 +f 34/1/121 151/1/121 13/1/121 +f 152/1/122 13/1/122 151/1/122 +f 45/1/123 13/1/123 152/1/123 +f 154/1/124 46/1/124 153/1/124 +f 153/1/125 46/1/125 45/1/125 +f 155/1/126 46/1/126 154/1/126 +f 152/1/127 153/1/127 45/1/127 +f 155/1/128 156/1/128 3/1/128 +f 154/1/129 156/1/129 155/1/129 +f 3/1/130 156/1/130 44/1/130 +f 44/1/131 156/1/131 149/1/131 +f 157/1/132 6/1/132 158/1/132 +f 6/1/133 8/1/133 158/1/133 +f 159/1/134 37/1/134 6/1/134 +f 159/1/135 6/1/135 157/1/135 +f 5/1/136 37/1/136 159/1/136 +f 5/1/137 159/1/137 160/1/137 +f 5/1/138 160/1/138 161/1/138 +f 5/1/139 161/1/139 50/1/139 +f 50/1/140 162/1/140 51/1/140 +f 162/1/141 50/1/141 161/1/141 +f 52/1/142 51/1/142 162/1/142 +f 52/1/143 162/1/143 163/1/143 +f 38/1/144 52/1/144 163/1/144 +f 38/1/145 163/1/145 164/1/145 +f 9/1/146 164/1/146 165/1/146 +f 38/1/147 164/1/147 9/1/147 +f 166/1/148 9/1/148 165/1/148 +f 166/1/149 10/1/149 9/1/149 +f 8/1/150 10/1/150 167/1/150 +f 10/1/151 166/1/151 167/1/151 +f 8/1/152 167/1/152 158/1/152 +f 88/1/153 169/1/153 168/1/153 +f 78/1/154 169/1/154 88/1/154 +f 170/1/155 169/1/155 78/1/155 +f 77/1/156 170/1/156 78/1/156 +f 171/1/157 89/1/157 168/1/157 +f 168/1/158 89/1/158 88/1/158 +f 83/1/159 173/1/159 172/1/159 +f 171/1/160 173/1/160 87/1/160 +f 173/1/161 83/1/161 87/1/161 +f 171/1/162 87/1/162 89/1/162 +f 175/1/163 83/1/163 174/1/163 +f 83/1/164 172/1/164 174/1/164 +f 177/1/165 176/1/165 178/1/165 +f 178/1/166 176/1/166 76/1/166 +f 175/1/167 174/1/167 177/1/167 +f 178/1/168 175/1/168 177/1/168 +f 77/1/169 76/1/169 176/1/169 +f 176/1/170 170/1/170 77/1/170 +f 20/1/171 179/1/171 69/1/171 +f 63/1/172 182/1/172 181/1/172 +f 181/1/173 20/1/173 63/1/173 +f 69/1/174 179/1/174 180/1/174 +f 179/1/175 20/1/175 181/1/175 +f 183/1/176 69/1/176 180/1/176 +f 183/1/177 67/1/177 69/1/177 +f 184/1/178 65/1/178 185/1/178 +f 183/1/179 185/1/179 66/1/179 +f 185/1/180 65/1/180 66/1/180 +f 183/1/181 66/1/181 67/1/181 +f 186/1/182 65/1/182 184/1/182 +f 186/1/183 64/1/183 65/1/183 +f 187/1/184 188/1/184 62/1/184 +f 189/1/185 187/1/185 61/1/185 +f 61/1/186 187/1/186 62/1/186 +f 186/1/187 189/1/187 64/1/187 +f 64/1/188 189/1/188 61/1/188 +f 188/1/189 182/1/189 63/1/189 +f 63/1/190 62/1/190 188/1/190 +f 104/2/191 99/3/191 190/4/191 +f 110/5/191 106/6/191 105/7/191 +f 110/5/191 105/7/191 191/8/191 +f 115/9/191 113/10/191 180/11/191 +f 190/4/191 115/9/191 191/8/191 +f 167/12/191 192/13/191 158/14/191 +f 150/15/191 147/16/191 146/17/191 +f 190/4/191 193/18/191 141/19/191 +f 190/4/191 177/20/191 130/21/191 +f 141/19/191 145/22/191 142/23/191 +f 100/24/191 99/3/191 101/25/191 +f 97/26/191 190/4/191 98/27/191 +f 101/25/191 99/3/191 102/28/191 +f 103/29/191 102/28/191 99/3/191 +f 99/3/191 104/2/191 103/29/191 +f 98/27/191 190/4/191 99/3/191 +f 190/4/191 105/7/191 104/2/191 +f 94/30/191 192/13/191 95/31/191 +f 158/14/191 147/16/191 157/32/191 +f 158/14/191 192/13/191 94/30/191 +f 147/16/191 158/14/191 94/30/191 +f 150/15/192 146/17/192 151/33/192 +f 150/15/193 148/34/193 147/16/193 +f 159/35/194 147/16/194 160/36/194 +f 159/35/195 157/32/195 147/16/195 +f 192/13/191 96/37/191 95/31/191 +f 96/37/191 192/13/191 97/26/191 +f 190/4/191 97/26/191 192/13/191 +f 166/38/196 192/13/196 167/12/196 +f 166/38/197 165/39/197 192/13/197 +f 192/13/191 165/39/191 190/4/191 +f 165/39/191 164/40/191 190/4/191 +f 105/7/191 190/4/191 191/8/191 +f 110/5/191 191/8/191 111/41/191 +f 107/42/191 106/6/191 108/43/191 +f 109/44/191 108/43/191 110/5/191 +f 106/6/191 110/5/191 108/43/191 +f 186/45/198 191/8/198 189/46/198 +f 191/8/199 187/47/199 189/46/199 +f 191/8/191 112/48/191 111/41/191 +f 191/8/191 113/10/191 112/48/191 +f 182/49/191 188/50/191 191/8/191 +f 182/49/191 191/8/191 115/9/191 +f 191/8/200 188/50/200 187/47/200 +f 182/49/201 115/9/201 181/51/201 +f 181/51/202 115/9/202 179/52/202 +f 115/9/203 180/11/203 179/52/203 +f 190/4/191 116/53/191 115/9/191 +f 117/54/191 116/53/191 190/4/191 +f 118/55/191 190/4/191 119/56/191 +f 190/4/191 118/55/191 117/54/191 +f 183/57/204 180/11/204 113/10/204 +f 184/58/205 113/10/205 186/45/205 +f 114/59/191 113/10/191 115/9/191 +f 113/10/191 191/8/191 186/45/191 +f 185/60/206 113/10/206 184/58/206 +f 183/57/207 113/10/207 185/60/207 +f 119/56/191 122/61/191 120/62/191 +f 119/56/191 190/4/191 122/61/191 +f 121/63/191 120/62/191 122/61/191 +f 146/17/191 152/64/191 151/33/191 +f 194/65/208 153/66/208 152/64/208 +f 146/17/191 194/65/191 152/64/191 +f 194/65/209 141/19/209 154/67/209 +f 141/19/191 156/68/191 154/67/191 +f 153/66/191 194/65/191 154/67/191 +f 149/69/191 160/36/191 148/34/191 +f 147/16/191 148/34/191 160/36/191 +f 193/18/191 160/36/191 149/69/191 +f 161/70/191 160/36/191 193/18/191 +f 149/69/210 156/68/210 193/18/210 +f 193/18/191 156/68/191 141/19/191 +f 190/4/191 164/40/191 163/71/191 +f 193/18/191 190/4/191 163/71/191 +f 161/70/211 193/18/211 162/72/211 +f 162/72/212 193/18/212 163/71/212 +f 194/65/191 146/17/191 141/19/191 +f 145/22/191 141/19/191 146/17/191 +f 143/73/191 145/22/191 144/74/191 +f 143/73/191 142/23/191 145/22/191 +f 190/4/191 126/75/191 122/61/191 +f 128/76/191 127/77/191 190/4/191 +f 190/4/191 129/78/191 128/76/191 +f 125/79/191 190/4/191 127/77/191 +f 129/78/191 190/4/191 130/21/191 +f 130/21/213 177/20/213 174/80/213 +f 177/20/191 190/4/191 176/81/191 +f 140/82/191 176/81/191 190/4/191 +f 140/82/214 170/83/214 176/81/214 +f 140/82/215 169/84/215 170/83/215 +f 168/85/208 169/84/208 140/82/208 +f 190/4/191 125/79/191 126/75/191 +f 122/61/191 126/75/191 123/86/191 +f 123/86/191 126/75/191 124/87/191 +f 131/88/191 130/21/191 174/80/191 +f 131/88/216 174/80/216 172/89/216 +f 171/90/191 168/85/191 140/82/191 +f 132/91/191 131/88/191 134/92/191 +f 131/88/191 171/90/191 134/92/191 +f 131/88/217 173/93/217 171/90/217 +f 134/92/191 171/90/191 140/82/191 +f 172/89/218 173/93/218 131/88/218 +f 190/4/191 141/19/191 140/82/191 +f 140/82/191 133/94/191 134/92/191 +f 140/82/191 135/95/191 133/94/191 +f 139/96/191 135/95/191 140/82/191 +f 138/97/191 135/95/191 139/96/191 +f 138/97/191 137/98/191 135/95/191 +f 136/99/191 135/95/191 137/98/191 diff --git a/resources/meshes/ultimaker_replicator_plus_platform.3MF b/resources/meshes/ultimaker_replicator_plus_platform.3MF deleted file mode 100644 index 1d250b8113..0000000000 Binary files a/resources/meshes/ultimaker_replicator_plus_platform.3MF and /dev/null differ diff --git a/resources/meshes/ultimaker_replicator_plus_platform.obj b/resources/meshes/ultimaker_replicator_plus_platform.obj new file mode 100644 index 0000000000..f5b73f48b1 --- /dev/null +++ b/resources/meshes/ultimaker_replicator_plus_platform.obj @@ -0,0 +1,6749 @@ +# Blender 4.4.3 +# www.blender.org +mtllib ultimaker_replicator_plus_platform.mtl +o MR_ultimaker_replicator_plus_platform +v 183.406708 -102.404900 -7.578969 +v 185.567154 -100.064423 -6.939313 +v 187.500046 -97.970467 -11.478985 +v 185.567154 -100.064423 -6.939313 +v 185.703247 -99.916985 -6.898839 +v 187.500046 -97.970467 -11.478985 +v 187.500046 -97.970467 -11.478985 +v 185.703247 -99.916985 -6.898839 +v 187.500046 -97.970467 -6.362233 +v 176.923264 -109.428635 -9.472987 +v 179.084702 -107.087090 -8.845135 +v 187.500046 -97.970467 -11.478985 +v 179.084702 -107.087090 -8.845135 +v 181.245865 -104.745819 -8.213993 +v 187.500046 -97.970467 -11.478985 +v 187.500046 -97.970467 -11.478985 +v 181.245865 -104.745819 -8.213993 +v 183.406708 -102.404900 -7.578969 +v 152.905457 -135.447922 -20.784538 +v 152.905457 -135.447922 -16.681448 +v 154.000031 -134.262115 -20.784538 +v 152.905457 -135.447922 -16.681448 +v 153.252487 -135.071976 -16.224936 +v 154.000031 -134.262115 -20.784538 +v 154.000031 -134.262115 -20.784538 +v 153.252487 -135.071976 -16.224936 +v 161.747787 -125.868729 -13.819588 +v 161.747787 -125.868729 -13.819588 +v 166.091217 -121.163330 -12.583727 +v 154.000031 -134.262115 -20.784538 +v 166.091217 -121.163330 -12.583727 +v 170.243759 -116.664764 -11.396920 +v 154.000031 -134.262115 -20.784538 +v 154.000031 -134.262115 -20.784538 +v 170.243759 -116.664764 -11.396920 +v 187.500046 -97.970467 -11.478985 +v 170.243759 -116.664764 -11.396920 +v 174.863373 -111.660179 -10.068674 +v 187.500046 -97.970467 -11.478985 +v 187.500046 -97.970467 -11.478985 +v 174.863373 -111.660179 -10.068674 +v 176.923264 -109.428635 -9.472987 +v 161.500061 120.052078 -3.284557 +v 162.099899 120.052078 -3.284557 +v 161.500046 -99.651413 -3.284541 +v 162.099899 120.052078 -3.284557 +v 162.099884 -99.046654 -3.284541 +v 161.500046 -99.651413 -3.284541 +v -187.499954 -97.970436 -6.362200 +v -185.703140 -99.916954 -6.898806 +v -187.499954 -97.970436 -11.478952 +v -185.703140 -99.916954 -6.898806 +v -185.567062 -100.064392 -6.939280 +v -187.499954 -97.970436 -11.478952 +v -187.499954 -97.970436 -11.478952 +v -185.567062 -100.064392 -6.939280 +v -183.406631 -102.404869 -7.578935 +v -183.406631 -102.404869 -7.578935 +v -181.245773 -104.745789 -8.213961 +v -187.499954 -97.970436 -11.478952 +v -181.245773 -104.745789 -8.213961 +v -179.084610 -107.087059 -8.845102 +v -187.499954 -97.970436 -11.478952 +v -187.499954 -97.970436 -11.478952 +v -179.084610 -107.087059 -8.845102 +v -176.923187 -109.428604 -9.472957 +v -166.091156 -121.163300 -12.583697 +v -153.999969 -134.262085 -20.784512 +v -170.243683 -116.664734 -11.396892 +v -153.999969 -134.262085 -20.784512 +v -187.499954 -97.970436 -11.478952 +v -170.243683 -116.664734 -11.396892 +v -170.243683 -116.664734 -11.396892 +v -187.499954 -97.970436 -11.478952 +v -174.863312 -111.660149 -10.068644 +v -187.499954 -97.970436 -11.478952 +v -176.923187 -109.428604 -9.472957 +v -174.863312 -111.660149 -10.068644 +v -152.905396 -135.447891 -16.681421 +v -152.905396 -135.447891 -20.784512 +v -153.252411 -135.071945 -16.224909 +v -152.905396 -135.447891 -20.784512 +v -153.999969 -134.262085 -20.784512 +v -153.252411 -135.071945 -16.224909 +v -153.252411 -135.071945 -16.224909 +v -153.999969 -134.262085 -20.784512 +v -161.747711 -125.868698 -13.819559 +v -153.999969 -134.262085 -20.784512 +v -166.091156 -121.163300 -12.583697 +v -161.747711 -125.868698 -13.819559 +v -187.374954 -98.947891 0.340490 +v -186.999954 -98.947891 1.215490 +v -186.999939 120.052109 1.215474 +v -186.999939 120.052109 1.215474 +v -189.999939 120.052109 -5.784526 +v -189.999954 -98.947891 -5.784510 +v -189.999954 -98.947891 -5.784510 +v -189.624954 -98.947891 -4.909510 +v -186.999939 120.052109 1.215474 +v -189.624954 -98.947891 -4.909510 +v -189.249954 -98.947891 -4.034510 +v -186.999939 120.052109 1.215474 +v -186.999939 120.052109 1.215474 +v -189.249954 -98.947891 -4.034510 +v -188.874954 -98.947891 -3.159510 +v -188.874954 -98.947891 -3.159510 +v -188.499954 -98.947891 -2.284510 +v -186.999939 120.052109 1.215474 +v -188.499954 -98.947891 -2.284510 +v -187.749954 -98.947891 -0.534510 +v -186.999939 120.052109 1.215474 +v -186.999939 120.052109 1.215474 +v -187.749954 -98.947891 -0.534510 +v -187.374954 -98.947891 0.340490 +v 164.250046 -107.197922 0.215460 +v 158.000046 -102.947922 -0.784539 +v 156.000046 -104.947922 -0.784539 +v 154.000031 -115.447922 0.215461 +v 154.000031 -123.947922 1.215462 +v 162.250031 -117.697922 1.215461 +v 162.000046 -98.947922 -0.784541 +v 160.000046 -100.947922 -0.784541 +v 178.750046 -105.197922 1.215459 +v 178.750046 -105.197922 1.215459 +v 180.812546 -103.635422 1.215459 +v 162.000046 -98.947922 -0.784541 +v 180.812546 -103.635422 1.215459 +v 182.875046 -102.072922 1.215458 +v 162.000046 -98.947922 -0.784541 +v 162.000046 -98.947922 -0.784541 +v 182.875046 -102.072922 1.215458 +v 183.906296 -101.291672 1.215457 +v 183.906296 -101.291672 1.215457 +v 184.937546 -100.510422 1.215457 +v 162.000046 -98.947922 -0.784541 +v 184.937546 -100.510422 1.215457 +v 185.968796 -99.729172 1.215457 +v 162.000046 -98.947922 -0.784541 +v 162.000046 -98.947922 -0.784541 +v 185.968796 -99.729172 1.215457 +v 187.000046 -98.947922 1.215457 +v 164.250046 -107.197922 0.215460 +v 156.000046 -104.947922 -0.784539 +v 159.125031 -111.322922 0.215461 +v 156.000046 -104.947922 -0.784539 +v 154.000046 -106.947922 -0.784539 +v 159.125031 -111.322922 0.215461 +v 159.125031 -111.322922 0.215461 +v 154.000046 -106.947922 -0.784539 +v 154.000031 -115.447922 0.215461 +v 154.000031 -115.447922 0.215461 +v 162.250031 -117.697922 1.215461 +v 159.125031 -111.322922 0.215461 +v 162.250031 -117.697922 1.215461 +v 166.375031 -114.572922 1.215460 +v 159.125031 -111.322922 0.215461 +v 159.125031 -111.322922 0.215461 +v 166.375031 -114.572922 1.215460 +v 164.250046 -107.197922 0.215460 +v 166.375031 -114.572922 1.215460 +v 170.500031 -111.447922 1.215460 +v 164.250046 -107.197922 0.215460 +v 164.250046 -107.197922 0.215460 +v 170.500031 -111.447922 1.215460 +v 174.625031 -108.322922 1.215459 +v 160.000046 -100.947922 -0.784541 +v 158.000046 -102.947922 -0.784539 +v 178.750046 -105.197922 1.215459 +v 158.000046 -102.947922 -0.784539 +v 164.250046 -107.197922 0.215460 +v 178.750046 -105.197922 1.215459 +v 178.750046 -105.197922 1.215459 +v 164.250046 -107.197922 0.215460 +v 176.687546 -106.760422 1.215459 +v 164.250046 -107.197922 0.215460 +v 174.625031 -108.322922 1.215459 +v 176.687546 -106.760422 1.215459 +v -155.035477 -106.447891 -3.255711 +v -154.783401 -106.447891 -3.284512 +v -158.650452 -110.969971 -2.393444 +v -154.783401 -106.447891 -3.284512 +v -154.148178 -107.094444 -3.284512 +v -158.650452 -110.969971 -2.393444 +v -158.650452 -110.969971 -2.393444 +v -154.148178 -107.094444 -3.284512 +v -154.122742 -112.603630 -2.636372 +v -158.241531 -103.241867 -3.256069 +v -163.553604 -106.947090 -2.395816 +v -161.499954 -99.983421 -3.257260 +v -163.553604 -106.947090 -2.395816 +v -169.582657 -99.065201 -2.685879 +v -161.499954 -99.983421 -3.257260 +v -161.499954 -99.983421 -3.257260 +v -169.582657 -99.065201 -2.685879 +v -161.499954 -99.651382 -3.284512 +v -169.582657 -99.065201 -2.685879 +v -162.099808 -99.046623 -3.284512 +v -161.499954 -99.651382 -3.284512 +v -183.762741 -99.222572 -1.536342 +v -183.941238 -99.077583 -1.537196 +v -180.995377 -99.075989 -1.772868 +v -177.501694 -104.225273 -1.514582 +v -178.798965 -103.199432 -1.518039 +v -174.699203 -99.071297 -2.276561 +v -178.798965 -103.199432 -1.518039 +v -179.572159 -102.585800 -1.520319 +v -174.699203 -99.071297 -2.276561 +v -174.699203 -99.071297 -2.276561 +v -179.572159 -102.585800 -1.520319 +v -180.995377 -99.075989 -1.772868 +v -179.572159 -102.585800 -1.520319 +v -181.658646 -100.920105 -1.527430 +v -180.995377 -99.075989 -1.772868 +v -180.995377 -99.075989 -1.772868 +v -181.658646 -100.920105 -1.527430 +v -183.762741 -99.222572 -1.536342 +v -169.582657 -99.065201 -2.685879 +v -173.391022 -107.451050 -1.506114 +v -174.699203 -99.071297 -2.276561 +v -173.391022 -107.451050 -1.506114 +v -175.440811 -105.846649 -1.509921 +v -174.699203 -99.071297 -2.276561 +v -174.699203 -99.071297 -2.276561 +v -175.440811 -105.846649 -1.509921 +v -177.501694 -104.225273 -1.514582 +v -165.245087 -113.771347 -1.496631 +v -169.315826 -110.621979 -1.500438 +v -163.553604 -106.947090 -2.395816 +v -169.315826 -110.621979 -1.500438 +v -169.652954 -110.360443 -1.500827 +v -163.553604 -106.947090 -2.395816 +v -163.553604 -106.947090 -2.395816 +v -169.652954 -110.360443 -1.500827 +v -169.582657 -99.065201 -2.685879 +v -169.652954 -110.360443 -1.500827 +v -171.129089 -109.213722 -1.502696 +v -169.582657 -99.065201 -2.685879 +v -169.582657 -99.065201 -2.685879 +v -171.129089 -109.213722 -1.502696 +v -173.391022 -107.451050 -1.506114 +v -161.198303 -116.889557 -1.494174 +v -165.245087 -113.771347 -1.496631 +v -158.650452 -110.969971 -2.393444 +v -165.245087 -113.771347 -1.496631 +v -163.553604 -106.947090 -2.395816 +v -158.650452 -110.969971 -2.393444 +v -158.650452 -110.969971 -2.393444 +v -163.553604 -106.947090 -2.395816 +v -155.035477 -106.447891 -3.255711 +v -163.553604 -106.947090 -2.395816 +v -158.241531 -103.241867 -3.256069 +v -155.035477 -106.447891 -3.255711 +v -161.198303 -116.889557 -1.494174 +v -158.650452 -110.969971 -2.393444 +v -160.458160 -117.458786 -1.493846 +v -158.650452 -110.969971 -2.393444 +v -154.122742 -112.603630 -2.636372 +v -160.458160 -117.458786 -1.493846 +v -160.458160 -117.458786 -1.493846 +v -154.122742 -112.603630 -2.636372 +v -154.111511 -122.329681 -1.492130 +v -153.999969 -137.947891 -15.784510 +v 154.000031 -137.947922 -15.784536 +v -153.999969 -134.447891 -11.534511 +v 154.000031 -137.947922 -15.784536 +v 154.000031 -134.447922 -11.534537 +v -153.999969 -134.447891 -11.534511 +v -153.999969 -134.447891 -11.534511 +v 154.000031 -134.447922 -11.534537 +v -153.999969 -130.947891 -7.284511 +v 154.000031 -134.447922 -11.534537 +v 154.000031 -130.947922 -7.284537 +v -153.999969 -130.947891 -7.284511 +v -153.999969 -130.947891 -7.284511 +v 154.000031 -130.947922 -7.284537 +v -153.999969 -127.447891 -3.034511 +v 154.000031 -130.947922 -7.284537 +v 154.000031 -127.447922 -3.034538 +v -153.999969 -127.447891 -3.034511 +v -153.999969 -127.447891 -3.034511 +v 154.000031 -127.447922 -3.034538 +v -153.999969 -123.947891 1.215489 +v 154.000031 -127.447922 -3.034538 +v 154.000031 -123.947922 1.215462 +v -153.999969 -123.947891 1.215489 +v 154.000046 -106.947922 -0.784539 +v -153.999954 -106.947891 -0.784512 +v 154.000031 -115.447922 0.215461 +v -153.999954 -106.947891 -0.784512 +v -153.999969 -115.447891 0.215488 +v 154.000031 -115.447922 0.215461 +v 154.000031 -115.447922 0.215461 +v -153.999969 -115.447891 0.215488 +v 154.000031 -123.947922 1.215462 +v -153.999969 -115.447891 0.215488 +v -153.999969 -123.947891 1.215489 +v 154.000031 -123.947922 1.215462 +v 171.625031 -116.697922 -7.784541 +v 172.000031 -118.447922 -10.784540 +v 176.500031 -113.572922 -9.534540 +v 187.398483 -101.276047 -5.456418 +v 187.046921 -101.166672 -4.503293 +v 184.843796 -103.385422 -4.972043 +v 183.203171 -102.291672 0.184207 +v 182.875046 -102.072922 1.215458 +v 180.812546 -103.635422 1.215459 +v 186.332077 -99.783859 0.301395 +v 185.968796 -99.729172 1.215457 +v 184.937546 -100.510422 1.215457 +v 175.328156 -110.291672 -2.815791 +v 175.562531 -110.947922 -4.159541 +v 177.718781 -108.947922 -3.847041 +v 167.500031 -123.322922 -12.034538 +v 172.000031 -118.447922 -10.784540 +v 167.218781 -121.135422 -8.722039 +v 172.000031 -118.447922 -10.784540 +v 171.625031 -116.697922 -7.784541 +v 167.218781 -121.135422 -8.722039 +v 167.218781 -121.135422 -8.722039 +v 171.625031 -116.697922 -7.784541 +v 166.937531 -118.947914 -5.409539 +v 163.000031 -128.197922 -13.284538 +v 167.500031 -123.322922 -12.034538 +v 162.812531 -125.572922 -9.659538 +v 167.500031 -123.322922 -12.034538 +v 167.218781 -121.135422 -8.722039 +v 162.812531 -125.572922 -9.659538 +v 162.812531 -125.572922 -9.659538 +v 167.218781 -121.135422 -8.722039 +v 162.625031 -122.947922 -6.034539 +v 167.218781 -121.135422 -8.722039 +v 166.937531 -118.947914 -5.409539 +v 162.625031 -122.947922 -6.034539 +v 162.625031 -122.947922 -6.034539 +v 166.937531 -118.947914 -5.409539 +v 162.437531 -120.322922 -2.409539 +v 166.937531 -118.947914 -5.409539 +v 166.656281 -116.760422 -2.097039 +v 162.437531 -120.322922 -2.409539 +v 187.421921 -99.947922 -2.440793 +v 185.992233 -100.838547 -1.643918 +v 186.343796 -100.947922 -2.597043 +v 185.992233 -100.838547 -1.643918 +v 183.859421 -102.729172 -1.878291 +v 186.343796 -100.947922 -2.597043 +v 188.500046 -98.947922 -2.284543 +v 187.750046 -98.947922 -0.534543 +v 187.421921 -99.947922 -2.440793 +v 187.750046 -98.947922 -0.534543 +v 186.695358 -99.838547 -0.612668 +v 187.421921 -99.947922 -2.440793 +v 187.421921 -99.947922 -2.440793 +v 186.695358 -99.838547 -0.612668 +v 185.992233 -100.838547 -1.643918 +v 186.695358 -99.838547 -0.612668 +v 185.640671 -100.729172 -0.690793 +v 185.992233 -100.838547 -1.643918 +v 185.992233 -100.838547 -1.643918 +v 185.640671 -100.729172 -0.690793 +v 183.859421 -102.729172 -1.878291 +v 187.000046 -98.947922 1.215457 +v 185.968796 -99.729172 1.215457 +v 187.375046 -98.947922 0.340457 +v 185.968796 -99.729172 1.215457 +v 186.332077 -99.783859 0.301395 +v 187.375046 -98.947922 0.340457 +v 187.375046 -98.947922 0.340457 +v 186.332077 -99.783859 0.301395 +v 187.750046 -98.947922 -0.534543 +v 185.289108 -100.619797 0.262332 +v 184.246140 -101.455734 0.223270 +v 184.585983 -101.619797 -0.768918 +v 184.585983 -101.619797 -0.768918 +v 184.246140 -101.455734 0.223270 +v 183.531296 -102.510422 -0.847041 +v 184.246140 -101.455734 0.223270 +v 183.203171 -102.291672 0.184207 +v 183.531296 -102.510422 -0.847041 +v 183.531296 -102.510422 -0.847041 +v 183.203171 -102.291672 0.184207 +v 181.117233 -103.963547 0.106084 +v 183.203171 -102.291672 0.184207 +v 180.812546 -103.635422 1.215459 +v 181.117233 -103.963547 0.106084 +v 181.117233 -103.963547 0.106084 +v 180.812546 -103.635422 1.215459 +v 178.750046 -105.197922 1.215459 +v 182.875046 -102.072922 1.215458 +v 183.203171 -102.291672 0.184207 +v 183.906296 -101.291672 1.215457 +v 183.203171 -102.291672 0.184207 +v 184.246140 -101.455734 0.223270 +v 183.906296 -101.291672 1.215457 +v 183.906296 -101.291672 1.215457 +v 184.246140 -101.455734 0.223270 +v 184.937546 -100.510422 1.215457 +v 184.246140 -101.455734 0.223270 +v 185.289108 -100.619797 0.262332 +v 184.937546 -100.510422 1.215457 +v 184.937546 -100.510422 1.215457 +v 185.289108 -100.619797 0.262332 +v 186.332077 -99.783859 0.301395 +v 187.750046 -98.947922 -0.534543 +v 186.332077 -99.783859 0.301395 +v 186.695358 -99.838547 -0.612668 +v 186.332077 -99.783859 0.301395 +v 185.289108 -100.619797 0.262332 +v 186.695358 -99.838547 -0.612668 +v 186.695358 -99.838547 -0.612668 +v 185.289108 -100.619797 0.262332 +v 185.640671 -100.729172 -0.690793 +v 185.289108 -100.619797 0.262332 +v 184.585983 -101.619797 -0.768918 +v 185.640671 -100.729172 -0.690793 +v 185.640671 -100.729172 -0.690793 +v 184.585983 -101.619797 -0.768918 +v 183.859421 -102.729172 -1.878291 +v 184.585983 -101.619797 -0.768918 +v 183.531296 -102.510422 -0.847041 +v 183.859421 -102.729172 -1.878291 +v 183.859421 -102.729172 -1.878291 +v 183.531296 -102.510422 -0.847041 +v 181.421921 -104.291672 -1.003291 +v 183.531296 -102.510422 -0.847041 +v 181.117233 -103.963547 0.106084 +v 181.421921 -104.291672 -1.003291 +v 181.421921 -104.291672 -1.003291 +v 181.117233 -103.963547 0.106084 +v 179.312546 -106.072922 -1.159541 +v 181.117233 -103.963547 0.106084 +v 178.750046 -105.197922 1.215459 +v 179.312546 -106.072922 -1.159541 +v 179.312546 -106.072922 -1.159541 +v 178.750046 -105.197922 1.215459 +v 177.203156 -107.854172 -1.315791 +v 175.093781 -109.635422 -1.472041 +v 170.875031 -113.197922 -1.784541 +v 175.328156 -110.291672 -2.815791 +v 170.875031 -113.197922 -1.784541 +v 171.062531 -114.072922 -3.284541 +v 175.328156 -110.291672 -2.815791 +v 175.328156 -110.291672 -2.815791 +v 171.062531 -114.072922 -3.284541 +v 175.562531 -110.947922 -4.159541 +v 190.000046 -98.947922 -5.784543 +v 189.625046 -98.947922 -4.909543 +v 187.398483 -101.276047 -5.456418 +v 187.398483 -101.276047 -5.456418 +v 189.625046 -98.947922 -4.909543 +v 187.046921 -101.166672 -4.503293 +v 189.625046 -98.947922 -4.909543 +v 189.250046 -98.947922 -4.034543 +v 187.046921 -101.166672 -4.503293 +v 187.046921 -101.166672 -4.503293 +v 189.250046 -98.947922 -4.034543 +v 188.875046 -98.947922 -3.159543 +v 175.093781 -109.635422 -1.472041 +v 175.328156 -110.291672 -2.815791 +v 177.203156 -107.854172 -1.315791 +v 175.328156 -110.291672 -2.815791 +v 177.718781 -108.947922 -3.847041 +v 177.203156 -107.854172 -1.315791 +v 177.203156 -107.854172 -1.315791 +v 177.718781 -108.947922 -3.847041 +v 179.312546 -106.072922 -1.159541 +v 177.718781 -108.947922 -3.847041 +v 179.875046 -106.947922 -3.534541 +v 179.312546 -106.072922 -1.159541 +v 179.312546 -106.072922 -1.159541 +v 179.875046 -106.947922 -3.534541 +v 181.421921 -104.291672 -1.003291 +v 179.875046 -106.947922 -3.534541 +v 182.031296 -104.947922 -3.222041 +v 181.421921 -104.291672 -1.003291 +v 181.421921 -104.291672 -1.003291 +v 182.031296 -104.947922 -3.222041 +v 183.859421 -102.729172 -1.878291 +v 182.031296 -104.947922 -3.222041 +v 184.187546 -102.947922 -2.909542 +v 183.859421 -102.729172 -1.878291 +v 183.859421 -102.729172 -1.878291 +v 184.187546 -102.947922 -2.909542 +v 186.343796 -100.947922 -2.597043 +v 184.187546 -102.947922 -2.909542 +v 186.695358 -101.057297 -3.550168 +v 186.343796 -100.947922 -2.597043 +v 186.343796 -100.947922 -2.597043 +v 186.695358 -101.057297 -3.550168 +v 187.421921 -99.947922 -2.440793 +v 186.695358 -101.057297 -3.550168 +v 187.785202 -100.002609 -3.354855 +v 187.421921 -99.947922 -2.440793 +v 187.421921 -99.947922 -2.440793 +v 187.785202 -100.002609 -3.354855 +v 188.500046 -98.947922 -2.284543 +v 171.062531 -114.072922 -3.284541 +v 171.250031 -114.947922 -4.784539 +v 175.562531 -110.947922 -4.159541 +v 171.250031 -114.947922 -4.784539 +v 176.031281 -112.260422 -6.847041 +v 175.562531 -110.947922 -4.159541 +v 175.562531 -110.947922 -4.159541 +v 176.031281 -112.260422 -6.847041 +v 177.718781 -108.947922 -3.847041 +v 176.031281 -112.260422 -6.847041 +v 178.234406 -110.041672 -6.378291 +v 177.718781 -108.947922 -3.847041 +v 177.718781 -108.947922 -3.847041 +v 178.234406 -110.041672 -6.378291 +v 179.875046 -106.947922 -3.534541 +v 178.234406 -110.041672 -6.378291 +v 180.437531 -107.822922 -5.909541 +v 179.875046 -106.947922 -3.534541 +v 179.875046 -106.947922 -3.534541 +v 180.437531 -107.822922 -5.909541 +v 182.031296 -104.947922 -3.222041 +v 180.437531 -107.822922 -5.909541 +v 182.640671 -105.604172 -5.440793 +v 182.031296 -104.947922 -3.222041 +v 182.031296 -104.947922 -3.222041 +v 182.640671 -105.604172 -5.440793 +v 184.187546 -102.947922 -2.909542 +v 182.640671 -105.604172 -5.440793 +v 184.843796 -103.385422 -4.972043 +v 184.187546 -102.947922 -2.909542 +v 184.187546 -102.947922 -2.909542 +v 184.843796 -103.385422 -4.972043 +v 186.695358 -101.057297 -3.550168 +v 184.843796 -103.385422 -4.972043 +v 187.046921 -101.166672 -4.503293 +v 186.695358 -101.057297 -3.550168 +v 186.695358 -101.057297 -3.550168 +v 187.046921 -101.166672 -4.503293 +v 187.785202 -100.002609 -3.354855 +v 187.046921 -101.166672 -4.503293 +v 188.875046 -98.947922 -3.159543 +v 187.785202 -100.002609 -3.354855 +v 187.785202 -100.002609 -3.354855 +v 188.875046 -98.947922 -3.159543 +v 188.500046 -98.947922 -2.284543 +v 162.437531 -120.322922 -2.409539 +v 154.000031 -127.447922 -3.034538 +v 162.625031 -122.947922 -6.034539 +v 154.000031 -127.447922 -3.034538 +v 154.000031 -130.947922 -7.284537 +v 162.625031 -122.947922 -6.034539 +v 162.625031 -122.947922 -6.034539 +v 154.000031 -130.947922 -7.284537 +v 162.812531 -125.572922 -9.659538 +v 154.000031 -130.947922 -7.284537 +v 154.000031 -134.447922 -11.534537 +v 162.812531 -125.572922 -9.659538 +v 162.812531 -125.572922 -9.659538 +v 154.000031 -134.447922 -11.534537 +v 163.000031 -128.197922 -13.284538 +v 154.000031 -134.447922 -11.534537 +v 154.000031 -137.947922 -15.784536 +v 163.000031 -128.197922 -13.284538 +v 176.687546 -106.760422 1.215459 +v 174.625031 -108.322922 1.215459 +v 174.859406 -108.979172 -0.128291 +v 174.625031 -108.322922 1.215459 +v 170.500031 -111.447922 1.215460 +v 174.859406 -108.979172 -0.128291 +v 174.859406 -108.979172 -0.128291 +v 170.500031 -111.447922 1.215460 +v 170.687531 -112.322922 -0.284541 +v 170.500031 -111.447922 1.215460 +v 166.375031 -114.572922 1.215460 +v 170.687531 -112.322922 -0.284541 +v 170.687531 -112.322922 -0.284541 +v 166.375031 -114.572922 1.215460 +v 166.656281 -116.760422 -2.097039 +v 166.375031 -114.572922 1.215460 +v 162.250031 -117.697922 1.215461 +v 166.656281 -116.760422 -2.097039 +v 166.656281 -116.760422 -2.097039 +v 162.250031 -117.697922 1.215461 +v 162.437531 -120.322922 -2.409539 +v 162.250031 -117.697922 1.215461 +v 154.000031 -123.947922 1.215462 +v 162.437531 -120.322922 -2.409539 +v 162.437531 -120.322922 -2.409539 +v 154.000031 -123.947922 1.215462 +v 154.000031 -127.447922 -3.034538 +v 178.750046 -105.197922 1.215459 +v 176.687546 -106.760422 1.215459 +v 177.203156 -107.854172 -1.315791 +v 176.687546 -106.760422 1.215459 +v 174.859406 -108.979172 -0.128291 +v 177.203156 -107.854172 -1.315791 +v 177.203156 -107.854172 -1.315791 +v 174.859406 -108.979172 -0.128291 +v 175.093781 -109.635422 -1.472041 +v 174.859406 -108.979172 -0.128291 +v 170.687531 -112.322922 -0.284541 +v 175.093781 -109.635422 -1.472041 +v 175.093781 -109.635422 -1.472041 +v 170.687531 -112.322922 -0.284541 +v 170.875031 -113.197922 -1.784541 +v 170.687531 -112.322922 -0.284541 +v 166.656281 -116.760422 -2.097039 +v 170.875031 -113.197922 -1.784541 +v 170.875031 -113.197922 -1.784541 +v 166.656281 -116.760422 -2.097039 +v 171.062531 -114.072922 -3.284541 +v 166.656281 -116.760422 -2.097039 +v 166.937531 -118.947914 -5.409539 +v 171.062531 -114.072922 -3.284541 +v 171.062531 -114.072922 -3.284541 +v 166.937531 -118.947914 -5.409539 +v 171.250031 -114.947922 -4.784539 +v 166.937531 -118.947914 -5.409539 +v 171.625031 -116.697922 -7.784541 +v 171.250031 -114.947922 -4.784539 +v 171.250031 -114.947922 -4.784539 +v 171.625031 -116.697922 -7.784541 +v 176.031281 -112.260422 -6.847041 +v 171.625031 -116.697922 -7.784541 +v 176.500031 -113.572922 -9.534540 +v 176.031281 -112.260422 -6.847041 +v 176.031281 -112.260422 -6.847041 +v 176.500031 -113.572922 -9.534540 +v 178.234406 -110.041672 -6.378291 +v 176.500031 -113.572922 -9.534540 +v 178.750031 -111.135422 -8.909541 +v 178.234406 -110.041672 -6.378291 +v 178.234406 -110.041672 -6.378291 +v 178.750031 -111.135422 -8.909541 +v 180.437531 -107.822922 -5.909541 +v 178.750031 -111.135422 -8.909541 +v 181.000031 -108.697922 -8.284542 +v 180.437531 -107.822922 -5.909541 +v 180.437531 -107.822922 -5.909541 +v 181.000031 -108.697922 -8.284542 +v 182.640671 -105.604172 -5.440793 +v 181.000031 -108.697922 -8.284542 +v 183.250046 -106.260422 -7.659543 +v 182.640671 -105.604172 -5.440793 +v 182.640671 -105.604172 -5.440793 +v 183.250046 -106.260422 -7.659543 +v 184.843796 -103.385422 -4.972043 +v 183.250046 -106.260422 -7.659543 +v 185.500046 -103.822922 -7.034543 +v 184.843796 -103.385422 -4.972043 +v 184.843796 -103.385422 -4.972043 +v 185.500046 -103.822922 -7.034543 +v 187.398483 -101.276047 -5.456418 +v 185.500046 -103.822922 -7.034543 +v 187.750046 -101.385422 -6.409543 +v 187.398483 -101.276047 -5.456418 +v 187.398483 -101.276047 -5.456418 +v 187.750046 -101.385422 -6.409543 +v 190.000046 -98.947922 -5.784543 +v 162.000061 120.052078 -0.784557 +v -157.999954 -102.947891 -0.784512 +v -155.999954 -104.947891 -0.784512 +v -161.999939 120.052109 -0.784528 +v -161.999954 -98.947891 -0.784512 +v 162.000061 120.052078 -0.784557 +v -161.999954 -98.947891 -0.784512 +v -159.999954 -100.947891 -0.784512 +v 162.000061 120.052078 -0.784557 +v 162.000061 120.052078 -0.784557 +v -159.999954 -100.947891 -0.784512 +v -157.999954 -102.947891 -0.784512 +v -155.999954 -104.947891 -0.784512 +v -153.999954 -106.947891 -0.784512 +v 154.000046 -106.947922 -0.784539 +v 154.000046 -106.947922 -0.784539 +v 156.000046 -104.947922 -0.784539 +v -155.999954 -104.947891 -0.784512 +v 156.000046 -104.947922 -0.784539 +v 158.000046 -102.947922 -0.784539 +v -155.999954 -104.947891 -0.784512 +v -155.999954 -104.947891 -0.784512 +v 158.000046 -102.947922 -0.784539 +v 162.000061 120.052078 -0.784557 +v 158.000046 -102.947922 -0.784539 +v 160.000046 -100.947922 -0.784541 +v 162.000061 120.052078 -0.784557 +v 162.000061 120.052078 -0.784557 +v 160.000046 -100.947922 -0.784541 +v 162.000046 -98.947922 -0.784541 +v 185.409515 -97.830597 -1.419774 +v 183.941330 -99.077614 -1.537228 +v 185.409531 120.052078 -1.419790 +v 183.941330 -99.077614 -1.537228 +v 180.995468 -99.076019 -1.772900 +v 185.409531 120.052078 -1.419790 +v 162.099884 -99.046654 -3.284541 +v 162.099899 120.052078 -3.284557 +v 169.582748 -99.065231 -2.685908 +v 162.099899 120.052078 -3.284557 +v 185.409531 120.052078 -1.419790 +v 169.582748 -99.065231 -2.685908 +v 169.582748 -99.065231 -2.685908 +v 185.409531 120.052078 -1.419790 +v 174.699295 -99.071327 -2.276592 +v 185.409531 120.052078 -1.419790 +v 180.995468 -99.076019 -1.772900 +v 174.699295 -99.071327 -2.276592 +v -176.031219 -112.260391 -6.847010 +v -176.499969 -113.572891 -9.534510 +v -171.999969 -118.447891 -10.784510 +v -187.398392 -101.276016 -5.456384 +v -187.749954 -101.385391 -6.409509 +v -185.499954 -103.822891 -7.034509 +v -181.117142 -103.963516 0.106115 +v -180.812454 -103.635391 1.215490 +v -182.874954 -102.072891 1.215490 +v -175.328094 -110.291641 -2.815760 +v -175.093719 -109.635391 -1.472010 +v -177.203094 -107.854141 -1.315760 +v -187.374954 -98.947891 0.340490 +v -187.749954 -98.947891 -0.534510 +v -186.695267 -99.838516 -0.612635 +v -187.749954 -98.947891 -0.534510 +v -188.499954 -98.947891 -2.284510 +v -186.695267 -99.838516 -0.612635 +v -167.499969 -123.322891 -12.034510 +v -167.218719 -121.135391 -8.722011 +v -171.624969 -116.697891 -7.784509 +v -166.656219 -116.760391 -2.097010 +v -166.374969 -114.572891 1.215490 +v -170.687469 -112.322891 -0.284510 +v -166.374969 -114.572891 1.215490 +v -170.499969 -111.447891 1.215489 +v -170.687469 -112.322891 -0.284510 +v -170.687469 -112.322891 -0.284510 +v -170.499969 -111.447891 1.215489 +v -174.624969 -108.322891 1.215490 +v -162.249969 -117.697891 1.215490 +v -166.374969 -114.572891 1.215490 +v -162.437469 -120.322891 -2.409510 +v -166.374969 -114.572891 1.215490 +v -166.656219 -116.760391 -2.097010 +v -162.437469 -120.322891 -2.409510 +v -162.437469 -120.322891 -2.409510 +v -166.656219 -116.760391 -2.097010 +v -162.624969 -122.947891 -6.034510 +v -166.656219 -116.760391 -2.097010 +v -166.937469 -118.947884 -5.409511 +v -162.624969 -122.947891 -6.034510 +v -162.624969 -122.947891 -6.034510 +v -166.937469 -118.947884 -5.409511 +v -162.812469 -125.572891 -9.659510 +v -166.937469 -118.947884 -5.409511 +v -167.218719 -121.135391 -8.722011 +v -162.812469 -125.572891 -9.659510 +v -162.812469 -125.572891 -9.659510 +v -167.218719 -121.135391 -8.722011 +v -162.999969 -128.197891 -13.284510 +v -167.218719 -121.135391 -8.722011 +v -167.499969 -123.322891 -12.034510 +v -162.999969 -128.197891 -13.284510 +v -175.562469 -110.947891 -4.159510 +v -175.328094 -110.291641 -2.815760 +v -177.718719 -108.947891 -3.847010 +v -175.328094 -110.291641 -2.815760 +v -177.203094 -107.854141 -1.315760 +v -177.718719 -108.947891 -3.847010 +v -177.718719 -108.947891 -3.847010 +v -177.203094 -107.854141 -1.315760 +v -179.874954 -106.947891 -3.534510 +v -177.203094 -107.854141 -1.315760 +v -179.312454 -106.072891 -1.159510 +v -179.874954 -106.947891 -3.534510 +v -179.874954 -106.947891 -3.534510 +v -179.312454 -106.072891 -1.159510 +v -182.031204 -104.947891 -3.222010 +v -186.999954 -98.947891 1.215490 +v -187.374954 -98.947891 0.340490 +v -186.331985 -99.783829 0.301427 +v -187.374954 -98.947891 0.340490 +v -186.695267 -99.838516 -0.612635 +v -186.331985 -99.783829 0.301427 +v -186.331985 -99.783829 0.301427 +v -186.695267 -99.838516 -0.612635 +v -185.640579 -100.729141 -0.690760 +v -186.695267 -99.838516 -0.612635 +v -185.992142 -100.838516 -1.643885 +v -185.640579 -100.729141 -0.690760 +v -185.640579 -100.729141 -0.690760 +v -185.992142 -100.838516 -1.643885 +v -184.585892 -101.619766 -0.768885 +v -185.992142 -100.838516 -1.643885 +v -183.859329 -102.729141 -1.878260 +v -184.585892 -101.619766 -0.768885 +v -184.585892 -101.619766 -0.768885 +v -183.859329 -102.729141 -1.878260 +v -183.531204 -102.510391 -0.847010 +v -183.859329 -102.729141 -1.878260 +v -181.421829 -104.291641 -1.003260 +v -183.531204 -102.510391 -0.847010 +v -181.421829 -104.291641 -1.003260 +v -183.203079 -102.291641 0.184240 +v -183.531204 -102.510391 -0.847010 +v -183.531204 -102.510391 -0.847010 +v -183.203079 -102.291641 0.184240 +v -184.585892 -101.619766 -0.768885 +v -183.203079 -102.291641 0.184240 +v -184.246048 -101.455704 0.223302 +v -184.585892 -101.619766 -0.768885 +v -184.585892 -101.619766 -0.768885 +v -184.246048 -101.455704 0.223302 +v -185.640579 -100.729141 -0.690760 +v -184.246048 -101.455704 0.223302 +v -185.289017 -100.619766 0.262365 +v -185.640579 -100.729141 -0.690760 +v -185.640579 -100.729141 -0.690760 +v -185.289017 -100.619766 0.262365 +v -186.331985 -99.783829 0.301427 +v -185.289017 -100.619766 0.262365 +v -185.968704 -99.729141 1.215490 +v -186.331985 -99.783829 0.301427 +v -186.331985 -99.783829 0.301427 +v -185.968704 -99.729141 1.215490 +v -186.999954 -98.947891 1.215490 +v -181.421829 -104.291641 -1.003260 +v -181.117142 -103.963516 0.106115 +v -183.203079 -102.291641 0.184240 +v -181.117142 -103.963516 0.106115 +v -182.874954 -102.072891 1.215490 +v -183.203079 -102.291641 0.184240 +v -183.203079 -102.291641 0.184240 +v -182.874954 -102.072891 1.215490 +v -184.246048 -101.455704 0.223302 +v -182.874954 -102.072891 1.215490 +v -183.906204 -101.291641 1.215490 +v -184.246048 -101.455704 0.223302 +v -184.246048 -101.455704 0.223302 +v -183.906204 -101.291641 1.215490 +v -185.289017 -100.619766 0.262365 +v -183.906204 -101.291641 1.215490 +v -184.937454 -100.510391 1.215490 +v -185.289017 -100.619766 0.262365 +v -185.289017 -100.619766 0.262365 +v -184.937454 -100.510391 1.215490 +v -185.968704 -99.729141 1.215490 +v -178.749954 -105.197891 1.215490 +v -179.312454 -106.072891 -1.159510 +v -176.687454 -106.760391 1.215490 +v -179.312454 -106.072891 -1.159510 +v -177.203094 -107.854141 -1.315760 +v -176.687454 -106.760391 1.215490 +v -176.687454 -106.760391 1.215490 +v -177.203094 -107.854141 -1.315760 +v -174.859344 -108.979141 -0.128260 +v -177.203094 -107.854141 -1.315760 +v -175.093719 -109.635391 -1.472010 +v -174.859344 -108.979141 -0.128260 +v -174.859344 -108.979141 -0.128260 +v -175.093719 -109.635391 -1.472010 +v -170.874969 -113.197891 -1.784510 +v -188.499954 -98.947891 -2.284510 +v -187.421829 -99.947891 -2.440760 +v -186.695267 -99.838516 -0.612635 +v -187.421829 -99.947891 -2.440760 +v -186.343704 -100.947891 -2.597010 +v -186.695267 -99.838516 -0.612635 +v -186.695267 -99.838516 -0.612635 +v -186.343704 -100.947891 -2.597010 +v -185.992142 -100.838516 -1.643885 +v -186.343704 -100.947891 -2.597010 +v -184.187454 -102.947891 -2.909509 +v -185.992142 -100.838516 -1.643885 +v -185.992142 -100.838516 -1.643885 +v -184.187454 -102.947891 -2.909509 +v -183.859329 -102.729141 -1.878260 +v -184.187454 -102.947891 -2.909509 +v -182.031204 -104.947891 -3.222010 +v -183.859329 -102.729141 -1.878260 +v -183.859329 -102.729141 -1.878260 +v -182.031204 -104.947891 -3.222010 +v -181.421829 -104.291641 -1.003260 +v -182.031204 -104.947891 -3.222010 +v -179.312454 -106.072891 -1.159510 +v -181.421829 -104.291641 -1.003260 +v -181.421829 -104.291641 -1.003260 +v -179.312454 -106.072891 -1.159510 +v -181.117142 -103.963516 0.106115 +v -179.312454 -106.072891 -1.159510 +v -178.749954 -105.197891 1.215490 +v -181.117142 -103.963516 0.106115 +v -181.117142 -103.963516 0.106115 +v -178.749954 -105.197891 1.215490 +v -180.812454 -103.635391 1.215490 +v -170.874969 -113.197891 -1.784510 +v -175.093719 -109.635391 -1.472010 +v -171.062469 -114.072891 -3.284510 +v -175.093719 -109.635391 -1.472010 +v -175.328094 -110.291641 -2.815760 +v -171.062469 -114.072891 -3.284510 +v -171.062469 -114.072891 -3.284510 +v -175.328094 -110.291641 -2.815760 +v -171.249969 -114.947891 -4.784511 +v -175.328094 -110.291641 -2.815760 +v -175.562469 -110.947891 -4.159510 +v -171.249969 -114.947891 -4.784511 +v -171.249969 -114.947891 -4.784511 +v -175.562469 -110.947891 -4.159510 +v -171.624969 -116.697891 -7.784509 +v -189.999954 -98.947891 -5.784510 +v -187.749954 -101.385391 -6.409509 +v -189.624954 -98.947891 -4.909510 +v -187.749954 -101.385391 -6.409509 +v -187.398392 -101.276016 -5.456384 +v -189.624954 -98.947891 -4.909510 +v -189.624954 -98.947891 -4.909510 +v -187.398392 -101.276016 -5.456384 +v -189.249954 -98.947891 -4.034510 +v -184.843704 -103.385391 -4.972009 +v -186.695267 -101.057266 -3.550135 +v -187.046829 -101.166641 -4.503259 +v -186.695267 -101.057266 -3.550135 +v -187.785110 -100.002579 -3.354823 +v -187.046829 -101.166641 -4.503259 +v -176.499969 -113.572891 -9.534510 +v -176.031219 -112.260391 -6.847010 +v -178.749969 -111.135391 -8.909509 +v -176.031219 -112.260391 -6.847010 +v -178.234344 -110.041641 -6.378260 +v -178.749969 -111.135391 -8.909509 +v -178.749969 -111.135391 -8.909509 +v -178.234344 -110.041641 -6.378260 +v -180.999969 -108.697891 -8.284510 +v -178.234344 -110.041641 -6.378260 +v -180.437469 -107.822891 -5.909510 +v -180.999969 -108.697891 -8.284510 +v -180.999969 -108.697891 -8.284510 +v -180.437469 -107.822891 -5.909510 +v -183.249954 -106.260391 -7.659509 +v -180.437469 -107.822891 -5.909510 +v -182.640579 -105.604141 -5.440759 +v -183.249954 -106.260391 -7.659509 +v -183.249954 -106.260391 -7.659509 +v -182.640579 -105.604141 -5.440759 +v -185.499954 -103.822891 -7.034509 +v -182.640579 -105.604141 -5.440759 +v -184.843704 -103.385391 -4.972009 +v -185.499954 -103.822891 -7.034509 +v -185.499954 -103.822891 -7.034509 +v -184.843704 -103.385391 -4.972009 +v -187.398392 -101.276016 -5.456384 +v -184.843704 -103.385391 -4.972009 +v -187.046829 -101.166641 -4.503259 +v -187.398392 -101.276016 -5.456384 +v -187.398392 -101.276016 -5.456384 +v -187.046829 -101.166641 -4.503259 +v -189.249954 -98.947891 -4.034510 +v -187.046829 -101.166641 -4.503259 +v -187.785110 -100.002579 -3.354823 +v -189.249954 -98.947891 -4.034510 +v -189.249954 -98.947891 -4.034510 +v -187.785110 -100.002579 -3.354823 +v -188.874954 -98.947891 -3.159510 +v -153.999969 -123.947891 1.215489 +v -162.249969 -117.697891 1.215490 +v -153.999969 -127.447891 -3.034511 +v -162.249969 -117.697891 1.215490 +v -162.437469 -120.322891 -2.409510 +v -153.999969 -127.447891 -3.034511 +v -153.999969 -127.447891 -3.034511 +v -162.437469 -120.322891 -2.409510 +v -153.999969 -130.947891 -7.284511 +v -162.437469 -120.322891 -2.409510 +v -162.624969 -122.947891 -6.034510 +v -153.999969 -130.947891 -7.284511 +v -153.999969 -130.947891 -7.284511 +v -162.624969 -122.947891 -6.034510 +v -153.999969 -134.447891 -11.534511 +v -162.624969 -122.947891 -6.034510 +v -162.812469 -125.572891 -9.659510 +v -153.999969 -134.447891 -11.534511 +v -153.999969 -134.447891 -11.534511 +v -162.812469 -125.572891 -9.659510 +v -153.999969 -137.947891 -15.784510 +v -162.812469 -125.572891 -9.659510 +v -162.999969 -128.197891 -13.284510 +v -153.999969 -137.947891 -15.784510 +v -171.624969 -116.697891 -7.784509 +v -167.218719 -121.135391 -8.722011 +v -171.249969 -114.947891 -4.784511 +v -167.218719 -121.135391 -8.722011 +v -166.937469 -118.947884 -5.409511 +v -171.249969 -114.947891 -4.784511 +v -171.249969 -114.947891 -4.784511 +v -166.937469 -118.947884 -5.409511 +v -171.062469 -114.072891 -3.284510 +v -166.937469 -118.947884 -5.409511 +v -166.656219 -116.760391 -2.097010 +v -171.062469 -114.072891 -3.284510 +v -171.062469 -114.072891 -3.284510 +v -166.656219 -116.760391 -2.097010 +v -170.874969 -113.197891 -1.784510 +v -166.656219 -116.760391 -2.097010 +v -170.687469 -112.322891 -0.284510 +v -170.874969 -113.197891 -1.784510 +v -170.874969 -113.197891 -1.784510 +v -170.687469 -112.322891 -0.284510 +v -174.859344 -108.979141 -0.128260 +v -170.687469 -112.322891 -0.284510 +v -174.624969 -108.322891 1.215490 +v -174.859344 -108.979141 -0.128260 +v -174.859344 -108.979141 -0.128260 +v -174.624969 -108.322891 1.215490 +v -176.687454 -106.760391 1.215490 +v -188.499954 -98.947891 -2.284510 +v -188.874954 -98.947891 -3.159510 +v -187.421829 -99.947891 -2.440760 +v -188.874954 -98.947891 -3.159510 +v -187.785110 -100.002579 -3.354823 +v -187.421829 -99.947891 -2.440760 +v -187.421829 -99.947891 -2.440760 +v -187.785110 -100.002579 -3.354823 +v -186.343704 -100.947891 -2.597010 +v -187.785110 -100.002579 -3.354823 +v -186.695267 -101.057266 -3.550135 +v -186.343704 -100.947891 -2.597010 +v -186.343704 -100.947891 -2.597010 +v -186.695267 -101.057266 -3.550135 +v -184.187454 -102.947891 -2.909509 +v -186.695267 -101.057266 -3.550135 +v -184.843704 -103.385391 -4.972009 +v -184.187454 -102.947891 -2.909509 +v -184.187454 -102.947891 -2.909509 +v -184.843704 -103.385391 -4.972009 +v -182.031204 -104.947891 -3.222010 +v -184.843704 -103.385391 -4.972009 +v -182.640579 -105.604141 -5.440759 +v -182.031204 -104.947891 -3.222010 +v -182.031204 -104.947891 -3.222010 +v -182.640579 -105.604141 -5.440759 +v -179.874954 -106.947891 -3.534510 +v -182.640579 -105.604141 -5.440759 +v -180.437469 -107.822891 -5.909510 +v -179.874954 -106.947891 -3.534510 +v -179.874954 -106.947891 -3.534510 +v -180.437469 -107.822891 -5.909510 +v -177.718719 -108.947891 -3.847010 +v -180.437469 -107.822891 -5.909510 +v -178.234344 -110.041641 -6.378260 +v -177.718719 -108.947891 -3.847010 +v -177.718719 -108.947891 -3.847010 +v -178.234344 -110.041641 -6.378260 +v -175.562469 -110.947891 -4.159510 +v -178.234344 -110.041641 -6.378260 +v -176.031219 -112.260391 -6.847010 +v -175.562469 -110.947891 -4.159510 +v -175.562469 -110.947891 -4.159510 +v -176.031219 -112.260391 -6.847010 +v -171.624969 -116.697891 -7.784509 +v -176.031219 -112.260391 -6.847010 +v -171.999969 -118.447891 -10.784510 +v -171.624969 -116.697891 -7.784509 +v -171.624969 -116.697891 -7.784509 +v -171.999969 -118.447891 -10.784510 +v -167.499969 -123.322891 -12.034510 +v -161.999939 120.052109 -0.784528 +v -186.999939 120.052109 1.215474 +v -161.999954 -98.947891 -0.784512 +v -186.999939 120.052109 1.215474 +v -186.999954 -98.947891 1.215490 +v -161.999954 -98.947891 -0.784512 +v 163.000031 -128.197922 -13.284538 +v 154.000031 -137.947922 -15.784536 +v 154.000031 -137.947922 -20.784538 +v 185.500046 -103.822922 -7.034543 +v 190.000046 -98.947922 -10.784542 +v 187.750046 -101.385422 -6.409543 +v 190.000046 -98.947922 -10.784542 +v 190.000046 -98.947922 -5.784543 +v 187.750046 -101.385422 -6.409543 +v 185.500046 -103.822922 -7.034543 +v 183.250046 -106.260422 -7.659543 +v 190.000046 -98.947922 -10.784542 +v 183.250046 -106.260422 -7.659543 +v 181.000031 -108.697922 -8.284542 +v 190.000046 -98.947922 -10.784542 +v 190.000046 -98.947922 -10.784542 +v 181.000031 -108.697922 -8.284542 +v 178.750031 -111.135422 -8.909541 +v 178.750031 -111.135422 -8.909541 +v 176.500031 -113.572922 -9.534540 +v 190.000046 -98.947922 -10.784542 +v 176.500031 -113.572922 -9.534540 +v 172.000031 -118.447922 -10.784540 +v 190.000046 -98.947922 -10.784542 +v 190.000046 -98.947922 -10.784542 +v 172.000031 -118.447922 -10.784540 +v 154.000031 -137.947922 -20.784538 +v 172.000031 -118.447922 -10.784540 +v 167.500031 -123.322922 -12.034538 +v 154.000031 -137.947922 -20.784538 +v 154.000031 -137.947922 -20.784538 +v 167.500031 -123.322922 -12.034538 +v 163.000031 -128.197922 -13.284538 +v 154.000031 -137.947922 -20.784538 +v 154.000031 -137.947922 -15.784536 +v -153.999969 -137.947891 -20.784512 +v 154.000031 -137.947922 -15.784536 +v -153.999969 -137.947891 -15.784510 +v -153.999969 -137.947891 -20.784512 +v 103.357063 -106.447914 -3.284535 +v 154.783508 -106.447922 -3.284539 +v 154.148270 -107.094475 -3.284539 +v -154.148178 -107.094444 -3.284512 +v -154.783401 -106.447891 -3.284512 +v -103.356987 -106.447899 -3.284516 +v -103.356987 -106.447899 -3.284516 +v -51.678474 -106.447899 -3.284521 +v -154.148178 -107.094444 -3.284512 +v -51.678474 -106.447899 -3.284521 +v 0.000038 -106.447906 -3.284526 +v -154.148178 -107.094444 -3.284512 +v -154.148178 -107.094444 -3.284512 +v 0.000038 -106.447906 -3.284526 +v 154.148270 -107.094475 -3.284539 +v 0.000038 -106.447906 -3.284526 +v 51.678551 -106.447914 -3.284530 +v 154.148270 -107.094475 -3.284539 +v 154.148270 -107.094475 -3.284539 +v 51.678551 -106.447914 -3.284530 +v 103.357063 -106.447914 -3.284535 +v 190.000061 120.052078 -5.784559 +v 190.000046 -98.947922 -5.784543 +v 190.000061 120.052078 -10.784559 +v 190.000046 -98.947922 -5.784543 +v 190.000046 -98.947922 -10.784542 +v 190.000061 120.052078 -10.784559 +v 184.728592 -99.681305 -4.451085 +v 185.019821 -99.815674 -5.318852 +v 182.900436 -101.982193 -5.844326 +v 187.500046 -97.970467 -6.362233 +v 185.703247 -99.916985 -6.898839 +v 187.500046 -97.942841 -6.297688 +v 185.703247 -99.916985 -6.898839 +v 185.019821 -99.815674 -5.318852 +v 187.500046 -97.942841 -6.297688 +v 187.500046 -97.942841 -6.297688 +v 185.019821 -99.815674 -5.318852 +v 187.069260 -97.923393 -5.292500 +v 187.069260 -97.923393 -5.292500 +v 185.019821 -99.815674 -5.318852 +v 186.878067 -97.914223 -4.846409 +v 185.019821 -99.815674 -5.318852 +v 184.728592 -99.681305 -4.451085 +v 186.878067 -97.914223 -4.846409 +v 186.878067 -97.914223 -4.846409 +v 184.728592 -99.681305 -4.451085 +v 186.533676 -97.896820 -4.042836 +v 183.863708 -99.272209 -1.845417 +v 183.941330 -99.077614 -1.537228 +v 184.883530 -98.375237 -1.707150 +v 183.941330 -99.077614 -1.537228 +v 185.409515 -97.830597 -1.419774 +v 184.883530 -98.375237 -1.707150 +v 179.779572 -102.858269 -2.360446 +v 181.658722 -100.920135 -1.527462 +v 181.822647 -101.065712 -2.109654 +v 181.658722 -100.920135 -1.527462 +v 183.762833 -99.222603 -1.536374 +v 181.822647 -101.065712 -2.109654 +v 177.501785 -104.225304 -1.514613 +v 178.799072 -103.199463 -1.518070 +v 179.779572 -102.858269 -2.360446 +v 178.799072 -103.199463 -1.518070 +v 179.572266 -102.585831 -1.520352 +v 179.779572 -102.858269 -2.360446 +v 179.779572 -102.858269 -2.360446 +v 179.572266 -102.585831 -1.520352 +v 181.658722 -100.920135 -1.527462 +v 173.639450 -108.228867 -3.056727 +v 175.440918 -105.846680 -1.509951 +v 175.687851 -106.439857 -2.832133 +v 175.440918 -105.846680 -1.509951 +v 177.501785 -104.225304 -1.514613 +v 175.687851 -106.439857 -2.832133 +v 175.687851 -106.439857 -2.832133 +v 177.501785 -104.225304 -1.514613 +v 177.734619 -104.649673 -2.600573 +v 177.501785 -104.225304 -1.514613 +v 179.779572 -102.858269 -2.360446 +v 177.734619 -104.649673 -2.600573 +v 169.538467 -111.803581 -3.489771 +v 171.129150 -109.213753 -1.502726 +v 173.639450 -108.228867 -3.056727 +v 171.129150 -109.213753 -1.502726 +v 173.391068 -107.451080 -1.506144 +v 173.639450 -108.228867 -3.056727 +v 173.639450 -108.228867 -3.056727 +v 173.391068 -107.451080 -1.506144 +v 175.440918 -105.846680 -1.509951 +v 161.323425 -118.942223 -4.312348 +v 165.245132 -113.771378 -1.496660 +v 165.432800 -115.374489 -3.906801 +v 165.245132 -113.771378 -1.496660 +v 169.315887 -110.622009 -1.500467 +v 165.432800 -115.374489 -3.906801 +v 165.432800 -115.374489 -3.906801 +v 169.315887 -110.622009 -1.500467 +v 169.538467 -111.803581 -3.489771 +v 169.315887 -110.622009 -1.500467 +v 169.653015 -110.360474 -1.500857 +v 169.538467 -111.803581 -3.489771 +v 169.538467 -111.803581 -3.489771 +v 169.653015 -110.360474 -1.500857 +v 171.129150 -109.213753 -1.502726 +v 154.111572 -122.329712 -1.492157 +v 160.458237 -117.458817 -1.493874 +v 161.323425 -118.942223 -4.312348 +v 160.458237 -117.458817 -1.493874 +v 161.198364 -116.889587 -1.494202 +v 161.323425 -118.942223 -4.312348 +v 161.323425 -118.942223 -4.312348 +v 161.198364 -116.889587 -1.494202 +v 165.245132 -113.771378 -1.496660 +v 161.464783 -121.283974 -7.525170 +v 153.282928 -128.977997 -8.825110 +v 153.299515 -125.894913 -5.081375 +v 185.703247 -99.916985 -6.898839 +v 185.567154 -100.064423 -6.939313 +v 185.019821 -99.815674 -5.318852 +v 185.567154 -100.064423 -6.939313 +v 183.406708 -102.404900 -7.578969 +v 185.019821 -99.815674 -5.318852 +v 185.019821 -99.815674 -5.318852 +v 183.406708 -102.404900 -7.578969 +v 182.900436 -101.982193 -5.844326 +v 183.406708 -102.404900 -7.578969 +v 181.245865 -104.745819 -8.213993 +v 182.900436 -101.982193 -5.844326 +v 182.900436 -101.982193 -5.844326 +v 181.245865 -104.745819 -8.213993 +v 180.778763 -104.148651 -6.359241 +v 181.245865 -104.745819 -8.213993 +v 179.084702 -107.087090 -8.845135 +v 180.778763 -104.148651 -6.359241 +v 180.778763 -104.148651 -6.359241 +v 179.084702 -107.087090 -8.845135 +v 178.654938 -106.314781 -6.865558 +v 179.084702 -107.087090 -8.845135 +v 176.923264 -109.428635 -9.472987 +v 178.654938 -106.314781 -6.865558 +v 178.654938 -106.314781 -6.865558 +v 176.923264 -109.428635 -9.472987 +v 176.529160 -108.480431 -7.364817 +v 176.923264 -109.428635 -9.472987 +v 174.863373 -111.660179 -10.068674 +v 176.529160 -108.480431 -7.364817 +v 176.529160 -108.480431 -7.364817 +v 174.863373 -111.660179 -10.068674 +v 174.401611 -110.645554 -7.858225 +v 174.863373 -111.660179 -10.068674 +v 170.243759 -116.664764 -11.396920 +v 174.401611 -110.645554 -7.858225 +v 153.252487 -135.071976 -16.224936 +v 153.267151 -132.061386 -12.569236 +v 161.747787 -125.868729 -13.819588 +v 153.267151 -132.061386 -12.569236 +v 161.608215 -123.625000 -10.738396 +v 161.747787 -125.868729 -13.819588 +v 161.747787 -125.868729 -13.819588 +v 161.608215 -123.625000 -10.738396 +v 166.091217 -121.163330 -12.583727 +v 161.608215 -123.625000 -10.738396 +v 165.877136 -119.300522 -9.789964 +v 166.091217 -121.163330 -12.583727 +v 166.091217 -121.163330 -12.583727 +v 165.877136 -119.300522 -9.789964 +v 170.141937 -114.974113 -8.831147 +v 165.877136 -119.300522 -9.789964 +v 169.838745 -113.389473 -6.160280 +v 170.141937 -114.974113 -8.831147 +v 170.141937 -114.974113 -8.831147 +v 169.838745 -113.389473 -6.160280 +v 174.018784 -109.438065 -5.457362 +v 153.316559 -122.885269 -1.426796 +v 154.111572 -122.329712 -1.492157 +v 153.299515 -125.894913 -5.081375 +v 154.111572 -122.329712 -1.492157 +v 161.323425 -118.942223 -4.312348 +v 153.299515 -125.894913 -5.081375 +v 153.299515 -125.894913 -5.081375 +v 161.323425 -118.942223 -4.312348 +v 161.464783 -121.283974 -7.525170 +v 161.323425 -118.942223 -4.312348 +v 165.432800 -115.374489 -3.906801 +v 161.464783 -121.283974 -7.525170 +v 161.464783 -121.283974 -7.525170 +v 165.432800 -115.374489 -3.906801 +v 165.653732 -117.337975 -6.848184 +v 165.432800 -115.374489 -3.906801 +v 169.538467 -111.803581 -3.489771 +v 165.653732 -117.337975 -6.848184 +v 184.438721 -99.545975 -3.582959 +v 184.150391 -99.409630 -2.714413 +v 185.477844 -98.556107 -3.380337 +v 184.150391 -99.409630 -2.714413 +v 185.179779 -98.466270 -2.544049 +v 185.477844 -98.556107 -3.380337 +v 184.438721 -99.545975 -3.582959 +v 182.358841 -101.525650 -3.977444 +v 184.150391 -99.409630 -2.714413 +v 182.358841 -101.525650 -3.977444 +v 183.863708 -99.272209 -1.845417 +v 184.150391 -99.409630 -2.714413 +v 184.150391 -99.409630 -2.714413 +v 183.863708 -99.272209 -1.845417 +v 185.179779 -98.466270 -2.544049 +v 183.863708 -99.272209 -1.845417 +v 184.883530 -98.375237 -1.707150 +v 185.179779 -98.466270 -2.544049 +v 153.267151 -132.061386 -12.569236 +v 153.282928 -128.977997 -8.825110 +v 161.608215 -123.625000 -10.738396 +v 153.282928 -128.977997 -8.825110 +v 161.464783 -121.283974 -7.525170 +v 161.608215 -123.625000 -10.738396 +v 161.608215 -123.625000 -10.738396 +v 161.464783 -121.283974 -7.525170 +v 165.877136 -119.300522 -9.789964 +v 161.464783 -121.283974 -7.525170 +v 165.653732 -117.337975 -6.848184 +v 165.877136 -119.300522 -9.789964 +v 165.877136 -119.300522 -9.789964 +v 165.653732 -117.337975 -6.848184 +v 169.838745 -113.389473 -6.160280 +v 165.653732 -117.337975 -6.848184 +v 169.538467 -111.803581 -3.489771 +v 169.838745 -113.389473 -6.160280 +v 169.838745 -113.389473 -6.160280 +v 169.538467 -111.803581 -3.489771 +v 174.018784 -109.438065 -5.457362 +v 169.538467 -111.803581 -3.489771 +v 173.639450 -108.228867 -3.056727 +v 174.018784 -109.438065 -5.457362 +v 174.018784 -109.438065 -5.457362 +v 173.639450 -108.228867 -3.056727 +v 176.106552 -107.461143 -5.098422 +v 173.639450 -108.228867 -3.056727 +v 175.687851 -106.439857 -2.832133 +v 176.106552 -107.461143 -5.098422 +v 176.106552 -107.461143 -5.098422 +v 175.687851 -106.439857 -2.832133 +v 178.192627 -105.483414 -4.733119 +v 175.687851 -106.439857 -2.832133 +v 177.734619 -104.649673 -2.600573 +v 178.192627 -105.483414 -4.733119 +v 178.192627 -105.483414 -4.733119 +v 177.734619 -104.649673 -2.600573 +v 180.276779 -103.504875 -4.360049 +v 177.734619 -104.649673 -2.600573 +v 179.779572 -102.858269 -2.360446 +v 180.276779 -103.504875 -4.360049 +v 180.276779 -103.504875 -4.360049 +v 179.779572 -102.858269 -2.360446 +v 182.358841 -101.525650 -3.977444 +v 179.779572 -102.858269 -2.360446 +v 181.822647 -101.065712 -2.109654 +v 182.358841 -101.525650 -3.977444 +v 182.358841 -101.525650 -3.977444 +v 181.822647 -101.065712 -2.109654 +v 183.863708 -99.272209 -1.845417 +v 181.822647 -101.065712 -2.109654 +v 183.762833 -99.222603 -1.536374 +v 183.863708 -99.272209 -1.845417 +v 183.863708 -99.272209 -1.845417 +v 183.762833 -99.222603 -1.536374 +v 183.941330 -99.077614 -1.537228 +v 185.409515 -97.830597 -1.419774 +v 185.495880 -97.836273 -1.621319 +v 184.883530 -98.375237 -1.707150 +v 185.495880 -97.836273 -1.621319 +v 185.842590 -97.857986 -2.430272 +v 184.883530 -98.375237 -1.707150 +v 184.883530 -98.375237 -1.707150 +v 185.842590 -97.857986 -2.430272 +v 185.179779 -98.466270 -2.544049 +v 185.842590 -97.857986 -2.430272 +v 186.188522 -97.878120 -3.237454 +v 185.179779 -98.466270 -2.544049 +v 185.179779 -98.466270 -2.544049 +v 186.188522 -97.878120 -3.237454 +v 185.477844 -98.556107 -3.380337 +v 186.188522 -97.878120 -3.237454 +v 186.533676 -97.896820 -4.042836 +v 185.477844 -98.556107 -3.380337 +v 185.477844 -98.556107 -3.380337 +v 186.533676 -97.896820 -4.042836 +v 184.438721 -99.545975 -3.582959 +v 186.533676 -97.896820 -4.042836 +v 184.728592 -99.681305 -4.451085 +v 184.438721 -99.545975 -3.582959 +v 184.438721 -99.545975 -3.582959 +v 184.728592 -99.681305 -4.451085 +v 182.358841 -101.525650 -3.977444 +v 184.728592 -99.681305 -4.451085 +v 182.900436 -101.982193 -5.844326 +v 182.358841 -101.525650 -3.977444 +v 182.358841 -101.525650 -3.977444 +v 182.900436 -101.982193 -5.844326 +v 180.276779 -103.504875 -4.360049 +v 182.900436 -101.982193 -5.844326 +v 180.778763 -104.148651 -6.359241 +v 180.276779 -103.504875 -4.360049 +v 180.276779 -103.504875 -4.360049 +v 180.778763 -104.148651 -6.359241 +v 178.192627 -105.483414 -4.733119 +v 180.778763 -104.148651 -6.359241 +v 178.654938 -106.314781 -6.865558 +v 178.192627 -105.483414 -4.733119 +v 178.192627 -105.483414 -4.733119 +v 178.654938 -106.314781 -6.865558 +v 176.106552 -107.461143 -5.098422 +v 178.654938 -106.314781 -6.865558 +v 176.529160 -108.480431 -7.364817 +v 176.106552 -107.461143 -5.098422 +v 176.106552 -107.461143 -5.098422 +v 176.529160 -108.480431 -7.364817 +v 174.018784 -109.438065 -5.457362 +v 176.529160 -108.480431 -7.364817 +v 174.401611 -110.645554 -7.858225 +v 174.018784 -109.438065 -5.457362 +v 174.018784 -109.438065 -5.457362 +v 174.401611 -110.645554 -7.858225 +v 170.141937 -114.974113 -8.831147 +v 174.401611 -110.645554 -7.858225 +v 170.243759 -116.664764 -11.396920 +v 170.141937 -114.974113 -8.831147 +v 170.141937 -114.974113 -8.831147 +v 170.243759 -116.664764 -11.396920 +v 166.091217 -121.163330 -12.583727 +v -178.749969 -111.135391 -8.909509 +v -180.999969 -108.697891 -8.284510 +v -189.999954 -98.947891 -10.784510 +v -180.999969 -108.697891 -8.284510 +v -183.249954 -106.260391 -7.659509 +v -189.999954 -98.947891 -10.784510 +v -153.999969 -137.947891 -20.784512 +v -153.999969 -137.947891 -15.784510 +v -162.999969 -128.197891 -13.284510 +v -183.249954 -106.260391 -7.659509 +v -185.499954 -103.822891 -7.034509 +v -189.999954 -98.947891 -10.784510 +v -185.499954 -103.822891 -7.034509 +v -187.749954 -101.385391 -6.409509 +v -189.999954 -98.947891 -10.784510 +v -189.999954 -98.947891 -10.784510 +v -187.749954 -101.385391 -6.409509 +v -189.999954 -98.947891 -5.784510 +v -162.999969 -128.197891 -13.284510 +v -167.499969 -123.322891 -12.034510 +v -153.999969 -137.947891 -20.784512 +v -167.499969 -123.322891 -12.034510 +v -171.999969 -118.447891 -10.784510 +v -153.999969 -137.947891 -20.784512 +v -153.999969 -137.947891 -20.784512 +v -171.999969 -118.447891 -10.784510 +v -189.999954 -98.947891 -10.784510 +v -171.999969 -118.447891 -10.784510 +v -176.499969 -113.572891 -9.534510 +v -189.999954 -98.947891 -10.784510 +v -189.999954 -98.947891 -10.784510 +v -176.499969 -113.572891 -9.534510 +v -178.749969 -111.135391 -8.909509 +v -189.999954 -98.947891 -5.784510 +v -189.999939 120.052109 -5.784526 +v -189.999954 -98.947891 -10.784510 +v -189.999939 120.052109 -5.784526 +v -189.999939 120.052109 -10.784527 +v -189.999954 -98.947891 -10.784510 +v -153.999969 -134.262085 -20.784512 +v -153.999969 -137.947891 -20.784512 +v -187.499954 -97.970436 -11.478952 +v -153.999969 -137.947891 -20.784512 +v -189.999954 -98.947891 -10.784510 +v -187.499954 -97.970436 -11.478952 +v -187.499954 -97.970436 -11.478952 +v -189.999954 -98.947891 -10.784510 +v -187.499939 120.052109 -11.478970 +v -189.999954 -98.947891 -10.784510 +v -189.999939 120.052109 -10.784527 +v -187.499939 120.052109 -11.478970 +v 187.500061 120.052078 -6.297704 +v 187.500046 -97.942841 -6.297688 +v 187.069260 -97.923393 -5.292500 +v 187.069260 -97.923393 -5.292500 +v 186.878067 -97.914223 -4.846409 +v 187.500061 120.052078 -6.297704 +v 186.878067 -97.914223 -4.846409 +v 186.533676 -97.896820 -4.042836 +v 187.500061 120.052078 -6.297704 +v 187.500061 120.052078 -6.297704 +v 186.533676 -97.896820 -4.042836 +v 186.188522 -97.878120 -3.237454 +v 185.409515 -97.830597 -1.419774 +v 185.409531 120.052078 -1.419790 +v 185.495880 -97.836273 -1.621319 +v 185.409531 120.052078 -1.419790 +v 187.500061 120.052078 -6.297704 +v 185.495880 -97.836273 -1.621319 +v 185.495880 -97.836273 -1.621319 +v 187.500061 120.052078 -6.297704 +v 185.842590 -97.857986 -2.430272 +v 187.500061 120.052078 -6.297704 +v 186.188522 -97.878120 -3.237454 +v 185.842590 -97.857986 -2.430272 +v -164.249954 -107.197891 0.215489 +v -170.499969 -111.447891 1.215489 +v -166.374969 -114.572891 1.215490 +v -164.249954 -107.197891 0.215489 +v -166.374969 -114.572891 1.215490 +v -159.124969 -111.322891 0.215488 +v -166.374969 -114.572891 1.215490 +v -162.249969 -117.697891 1.215490 +v -159.124969 -111.322891 0.215488 +v -162.249969 -117.697891 1.215490 +v -153.999969 -123.947891 1.215489 +v -159.124969 -111.322891 0.215488 +v -159.124969 -111.322891 0.215488 +v -153.999969 -123.947891 1.215489 +v -153.999969 -115.447891 0.215488 +v -186.999954 -98.947891 1.215490 +v -185.968704 -99.729141 1.215490 +v -161.999954 -98.947891 -0.784512 +v -185.968704 -99.729141 1.215490 +v -184.937454 -100.510391 1.215490 +v -161.999954 -98.947891 -0.784512 +v -161.999954 -98.947891 -0.784512 +v -184.937454 -100.510391 1.215490 +v -183.906204 -101.291641 1.215490 +v -183.906204 -101.291641 1.215490 +v -182.874954 -102.072891 1.215490 +v -161.999954 -98.947891 -0.784512 +v -182.874954 -102.072891 1.215490 +v -180.812454 -103.635391 1.215490 +v -161.999954 -98.947891 -0.784512 +v -161.999954 -98.947891 -0.784512 +v -180.812454 -103.635391 1.215490 +v -159.999954 -100.947891 -0.784512 +v -178.749954 -105.197891 1.215490 +v -176.687454 -106.760391 1.215490 +v -164.249954 -107.197891 0.215489 +v -176.687454 -106.760391 1.215490 +v -174.624969 -108.322891 1.215490 +v -164.249954 -107.197891 0.215489 +v -164.249954 -107.197891 0.215489 +v -174.624969 -108.322891 1.215490 +v -170.499969 -111.447891 1.215489 +v -180.812454 -103.635391 1.215490 +v -178.749954 -105.197891 1.215490 +v -159.999954 -100.947891 -0.784512 +v -178.749954 -105.197891 1.215490 +v -164.249954 -107.197891 0.215489 +v -159.999954 -100.947891 -0.784512 +v -159.999954 -100.947891 -0.784512 +v -164.249954 -107.197891 0.215489 +v -157.999954 -102.947891 -0.784512 +v -164.249954 -107.197891 0.215489 +v -159.124969 -111.322891 0.215488 +v -157.999954 -102.947891 -0.784512 +v -157.999954 -102.947891 -0.784512 +v -159.124969 -111.322891 0.215488 +v -155.999954 -104.947891 -0.784512 +v -159.124969 -111.322891 0.215488 +v -153.999969 -115.447891 0.215488 +v -155.999954 -104.947891 -0.784512 +v -155.999954 -104.947891 -0.784512 +v -153.999969 -115.447891 0.215488 +v -153.999954 -106.947891 -0.784512 +v -161.499954 -99.983421 -3.257260 +v -161.499954 -99.983421 -4.284512 +v -158.241531 -103.241867 -3.256069 +v -161.499954 -99.983421 -4.284512 +v -155.035477 -106.447891 -4.284513 +v -158.241531 -103.241867 -3.256069 +v -158.241531 -103.241867 -3.256069 +v -155.035477 -106.447891 -4.284513 +v -155.035477 -106.447891 -3.255711 +v 187.500046 -97.942841 -6.297688 +v 187.500061 120.052078 -6.297704 +v 187.500046 -97.970467 -6.362233 +v 187.500061 120.052078 -6.297704 +v 187.500061 120.052078 -11.479002 +v 187.500046 -97.970467 -6.362233 +v 187.500046 -97.970467 -6.362233 +v 187.500061 120.052078 -11.479002 +v 187.500046 -97.970467 -11.478985 +v -176.106476 -107.461113 -5.098391 +v -178.192520 -105.483383 -4.733088 +v -177.734512 -104.649643 -2.600542 +v -187.069168 -97.923363 -5.292468 +v -186.877975 -97.914192 -4.846377 +v -185.019730 -99.815643 -5.318820 +v -154.111511 -122.329681 -1.492130 +v -153.316498 -122.885239 -1.426769 +v -153.299469 -125.894882 -5.081348 +v -161.323364 -118.942192 -4.312319 +v -153.299469 -125.894882 -5.081348 +v -153.282867 -128.977966 -8.825084 +v -154.111511 -122.329681 -1.492130 +v -153.299469 -125.894882 -5.081348 +v -160.458160 -117.458786 -1.493846 +v -153.299469 -125.894882 -5.081348 +v -161.323364 -118.942192 -4.312319 +v -160.458160 -117.458786 -1.493846 +v -160.458160 -117.458786 -1.493846 +v -161.323364 -118.942192 -4.312319 +v -161.198303 -116.889557 -1.494174 +v -161.323364 -118.942192 -4.312319 +v -165.432739 -115.374458 -3.906771 +v -161.198303 -116.889557 -1.494174 +v -161.198303 -116.889557 -1.494174 +v -165.432739 -115.374458 -3.906771 +v -165.245087 -113.771347 -1.496631 +v -173.391022 -107.451050 -1.506114 +v -171.129089 -109.213722 -1.502696 +v -169.538422 -111.803551 -3.489741 +v -171.129089 -109.213722 -1.502696 +v -169.652954 -110.360443 -1.500827 +v -169.538422 -111.803551 -3.489741 +v -169.652954 -110.360443 -1.500827 +v -169.315826 -110.621979 -1.500438 +v -169.538422 -111.803551 -3.489741 +v -169.538422 -111.803551 -3.489741 +v -169.315826 -110.621979 -1.500438 +v -165.245087 -113.771347 -1.496631 +v -169.538422 -111.803551 -3.489741 +v -173.639374 -108.228836 -3.056697 +v -173.391022 -107.451050 -1.506114 +v -173.639374 -108.228836 -3.056697 +v -175.687759 -106.439827 -2.832102 +v -173.391022 -107.451050 -1.506114 +v -173.391022 -107.451050 -1.506114 +v -175.687759 -106.439827 -2.832102 +v -175.440811 -105.846649 -1.509921 +v -183.941238 -99.077583 -1.537196 +v -183.762741 -99.222572 -1.536342 +v -183.863602 -99.272179 -1.845385 +v -183.762741 -99.222572 -1.536342 +v -181.658646 -100.920105 -1.527430 +v -183.863602 -99.272179 -1.845385 +v -183.863602 -99.272179 -1.845385 +v -181.658646 -100.920105 -1.527430 +v -181.822556 -101.065681 -2.109622 +v -181.658646 -100.920105 -1.527430 +v -179.572159 -102.585800 -1.520319 +v -181.822556 -101.065681 -2.109622 +v -181.822556 -101.065681 -2.109622 +v -179.572159 -102.585800 -1.520319 +v -179.779495 -102.858238 -2.360415 +v -179.572159 -102.585800 -1.520319 +v -178.798965 -103.199432 -1.518039 +v -179.779495 -102.858238 -2.360415 +v -179.779495 -102.858238 -2.360415 +v -178.798965 -103.199432 -1.518039 +v -177.734512 -104.649643 -2.600542 +v -178.798965 -103.199432 -1.518039 +v -177.501694 -104.225273 -1.514582 +v -177.734512 -104.649643 -2.600542 +v -185.409439 -97.830566 -1.419741 +v -183.941238 -99.077583 -1.537196 +v -184.883438 -98.375206 -1.707118 +v -183.941238 -99.077583 -1.537196 +v -183.863602 -99.272179 -1.845385 +v -184.883438 -98.375206 -1.707118 +v -184.883438 -98.375206 -1.707118 +v -183.863602 -99.272179 -1.845385 +v -184.150284 -99.409599 -2.714381 +v -183.863602 -99.272179 -1.845385 +v -181.822556 -101.065681 -2.109622 +v -184.150284 -99.409599 -2.714381 +v -185.179703 -98.466240 -2.544017 +v -185.842484 -97.857956 -2.430239 +v -185.495804 -97.836243 -1.621287 +v -184.728500 -99.681274 -4.451052 +v -186.533585 -97.896790 -4.042803 +v -185.477737 -98.556076 -3.380305 +v -186.533585 -97.896790 -4.042803 +v -186.188431 -97.878090 -3.237422 +v -185.477737 -98.556076 -3.380305 +v -185.477737 -98.556076 -3.380305 +v -186.188431 -97.878090 -3.237422 +v -185.842484 -97.857956 -2.430239 +v -187.069168 -97.923363 -5.292468 +v -185.019730 -99.815643 -5.318820 +v -187.499954 -97.942810 -6.297656 +v -185.019730 -99.815643 -5.318820 +v -185.703140 -99.916954 -6.898806 +v -187.499954 -97.942810 -6.297656 +v -187.499954 -97.942810 -6.297656 +v -185.703140 -99.916954 -6.898806 +v -187.499954 -97.970436 -6.362200 +v -176.529083 -108.480400 -7.364787 +v -179.084610 -107.087059 -8.845102 +v -178.654861 -106.314751 -6.865526 +v -179.084610 -107.087059 -8.845102 +v -181.245773 -104.745789 -8.213961 +v -178.654861 -106.314751 -6.865526 +v -178.654861 -106.314751 -6.865526 +v -181.245773 -104.745789 -8.213961 +v -180.778671 -104.148621 -6.359210 +v -181.245773 -104.745789 -8.213961 +v -183.406631 -102.404869 -7.578935 +v -180.778671 -104.148621 -6.359210 +v -180.778671 -104.148621 -6.359210 +v -183.406631 -102.404869 -7.578935 +v -182.900345 -101.982162 -5.844294 +v -183.406631 -102.404869 -7.578935 +v -185.567062 -100.064392 -6.939280 +v -182.900345 -101.982162 -5.844294 +v -176.923187 -109.428604 -9.472957 +v -174.401550 -110.645523 -7.858195 +v -174.863312 -111.660149 -10.068644 +v -174.401550 -110.645523 -7.858195 +v -170.141876 -114.974083 -8.831119 +v -174.863312 -111.660149 -10.068644 +v -174.863312 -111.660149 -10.068644 +v -170.141876 -114.974083 -8.831119 +v -170.243683 -116.664734 -11.396892 +v -170.141876 -114.974083 -8.831119 +v -165.877075 -119.300491 -9.789935 +v -170.243683 -116.664734 -11.396892 +v -170.243683 -116.664734 -11.396892 +v -165.877075 -119.300491 -9.789935 +v -166.091156 -121.163300 -12.583697 +v -165.877075 -119.300491 -9.789935 +v -161.608154 -123.624969 -10.738367 +v -166.091156 -121.163300 -12.583697 +v -166.091156 -121.163300 -12.583697 +v -161.608154 -123.624969 -10.738367 +v -161.747711 -125.868698 -13.819559 +v -161.608154 -123.624969 -10.738367 +v -153.252411 -135.071945 -16.224909 +v -161.747711 -125.868698 -13.819559 +v -169.838684 -113.389442 -6.160251 +v -165.432739 -115.374458 -3.906771 +v -165.653656 -117.337944 -6.848155 +v -165.432739 -115.374458 -3.906771 +v -161.323364 -118.942192 -4.312319 +v -165.653656 -117.337944 -6.848155 +v -165.653656 -117.337944 -6.848155 +v -161.323364 -118.942192 -4.312319 +v -161.464722 -121.283943 -7.525141 +v -161.323364 -118.942192 -4.312319 +v -153.282867 -128.977966 -8.825084 +v -161.464722 -121.283943 -7.525141 +v -161.464722 -121.283943 -7.525141 +v -153.282867 -128.977966 -8.825084 +v -153.267090 -132.061356 -12.569209 +v -185.842484 -97.857956 -2.430239 +v -185.179703 -98.466240 -2.544017 +v -185.477737 -98.556076 -3.380305 +v -185.179703 -98.466240 -2.544017 +v -184.438614 -99.545944 -3.582926 +v -185.477737 -98.556076 -3.380305 +v -185.477737 -98.556076 -3.380305 +v -184.438614 -99.545944 -3.582926 +v -184.728500 -99.681274 -4.451052 +v -177.734512 -104.649643 -2.600542 +v -178.192520 -105.483383 -4.733088 +v -179.779495 -102.858238 -2.360415 +v -178.192520 -105.483383 -4.733088 +v -180.276688 -103.504845 -4.360018 +v -179.779495 -102.858238 -2.360415 +v -179.779495 -102.858238 -2.360415 +v -180.276688 -103.504845 -4.360018 +v -181.822556 -101.065681 -2.109622 +v -180.276688 -103.504845 -4.360018 +v -182.358749 -101.525620 -3.977412 +v -181.822556 -101.065681 -2.109622 +v -181.822556 -101.065681 -2.109622 +v -182.358749 -101.525620 -3.977412 +v -184.150284 -99.409599 -2.714381 +v -165.245087 -113.771347 -1.496631 +v -165.432739 -115.374458 -3.906771 +v -169.538422 -111.803551 -3.489741 +v -165.432739 -115.374458 -3.906771 +v -169.838684 -113.389442 -6.160251 +v -169.538422 -111.803551 -3.489741 +v -169.538422 -111.803551 -3.489741 +v -169.838684 -113.389442 -6.160251 +v -173.639374 -108.228836 -3.056697 +v -169.838684 -113.389442 -6.160251 +v -174.018707 -109.438034 -5.457331 +v -173.639374 -108.228836 -3.056697 +v -173.639374 -108.228836 -3.056697 +v -174.018707 -109.438034 -5.457331 +v -175.687759 -106.439827 -2.832102 +v -186.877975 -97.914192 -4.846377 +v -186.533585 -97.896790 -4.042803 +v -185.019730 -99.815643 -5.318820 +v -186.533585 -97.896790 -4.042803 +v -184.728500 -99.681274 -4.451052 +v -185.019730 -99.815643 -5.318820 +v -185.019730 -99.815643 -5.318820 +v -184.728500 -99.681274 -4.451052 +v -182.358749 -101.525620 -3.977412 +v -184.728500 -99.681274 -4.451052 +v -184.438614 -99.545944 -3.582926 +v -182.358749 -101.525620 -3.977412 +v -182.358749 -101.525620 -3.977412 +v -184.438614 -99.545944 -3.582926 +v -184.150284 -99.409599 -2.714381 +v -184.438614 -99.545944 -3.582926 +v -185.179703 -98.466240 -2.544017 +v -184.150284 -99.409599 -2.714381 +v -184.150284 -99.409599 -2.714381 +v -185.179703 -98.466240 -2.544017 +v -184.883438 -98.375206 -1.707118 +v -185.179703 -98.466240 -2.544017 +v -185.495804 -97.836243 -1.621287 +v -184.883438 -98.375206 -1.707118 +v -184.883438 -98.375206 -1.707118 +v -185.495804 -97.836243 -1.621287 +v -185.409439 -97.830566 -1.419741 +v -176.106476 -107.461113 -5.098391 +v -174.401550 -110.645523 -7.858195 +v -176.529083 -108.480400 -7.364787 +v -174.401550 -110.645523 -7.858195 +v -176.923187 -109.428604 -9.472957 +v -176.529083 -108.480400 -7.364787 +v -176.529083 -108.480400 -7.364787 +v -176.923187 -109.428604 -9.472957 +v -179.084610 -107.087059 -8.845102 +v -176.106476 -107.461113 -5.098391 +v -176.529083 -108.480400 -7.364787 +v -178.192520 -105.483383 -4.733088 +v -176.529083 -108.480400 -7.364787 +v -178.654861 -106.314751 -6.865526 +v -178.192520 -105.483383 -4.733088 +v -178.192520 -105.483383 -4.733088 +v -178.654861 -106.314751 -6.865526 +v -180.276688 -103.504845 -4.360018 +v -178.654861 -106.314751 -6.865526 +v -180.778671 -104.148621 -6.359210 +v -180.276688 -103.504845 -4.360018 +v -180.276688 -103.504845 -4.360018 +v -180.778671 -104.148621 -6.359210 +v -182.358749 -101.525620 -3.977412 +v -180.778671 -104.148621 -6.359210 +v -182.900345 -101.982162 -5.844294 +v -182.358749 -101.525620 -3.977412 +v -182.358749 -101.525620 -3.977412 +v -182.900345 -101.982162 -5.844294 +v -185.019730 -99.815643 -5.318820 +v -182.900345 -101.982162 -5.844294 +v -185.567062 -100.064392 -6.939280 +v -185.019730 -99.815643 -5.318820 +v -185.019730 -99.815643 -5.318820 +v -185.567062 -100.064392 -6.939280 +v -185.703140 -99.916954 -6.898806 +v -177.501694 -104.225273 -1.514582 +v -175.440811 -105.846649 -1.509921 +v -177.734512 -104.649643 -2.600542 +v -175.440811 -105.846649 -1.509921 +v -175.687759 -106.439827 -2.832102 +v -177.734512 -104.649643 -2.600542 +v -177.734512 -104.649643 -2.600542 +v -175.687759 -106.439827 -2.832102 +v -176.106476 -107.461113 -5.098391 +v -175.687759 -106.439827 -2.832102 +v -174.018707 -109.438034 -5.457331 +v -176.106476 -107.461113 -5.098391 +v -176.106476 -107.461113 -5.098391 +v -174.018707 -109.438034 -5.457331 +v -174.401550 -110.645523 -7.858195 +v -174.018707 -109.438034 -5.457331 +v -169.838684 -113.389442 -6.160251 +v -174.401550 -110.645523 -7.858195 +v -174.401550 -110.645523 -7.858195 +v -169.838684 -113.389442 -6.160251 +v -170.141876 -114.974083 -8.831119 +v -169.838684 -113.389442 -6.160251 +v -165.653656 -117.337944 -6.848155 +v -170.141876 -114.974083 -8.831119 +v -170.141876 -114.974083 -8.831119 +v -165.653656 -117.337944 -6.848155 +v -165.877075 -119.300491 -9.789935 +v -165.653656 -117.337944 -6.848155 +v -161.464722 -121.283943 -7.525141 +v -165.877075 -119.300491 -9.789935 +v -165.877075 -119.300491 -9.789935 +v -161.464722 -121.283943 -7.525141 +v -161.608154 -123.624969 -10.738367 +v -161.464722 -121.283943 -7.525141 +v -153.267090 -132.061356 -12.569209 +v -161.608154 -123.624969 -10.738367 +v -161.608154 -123.624969 -10.738367 +v -153.267090 -132.061356 -12.569209 +v -153.252411 -135.071945 -16.224909 +v -187.499954 -97.970436 -11.478952 +v -187.499939 120.052109 -11.478970 +v -187.499954 -97.970436 -6.362200 +v -187.499939 120.052109 -11.478970 +v -187.499939 120.052109 -6.297672 +v -187.499954 -97.970436 -6.362200 +v -187.499954 -97.970436 -6.362200 +v -187.499939 120.052109 -6.297672 +v -187.499954 -97.942810 -6.297656 +v -161.499939 120.052109 -3.284528 +v -161.499939 120.052109 -4.284528 +v -161.499954 -99.651382 -3.284512 +v -161.499939 120.052109 -4.284528 +v -161.499954 -99.983421 -4.284512 +v -161.499954 -99.651382 -3.284512 +v -161.499954 -99.651382 -3.284512 +v -161.499954 -99.983421 -4.284512 +v -161.499954 -99.983421 -3.257260 +v 187.500061 120.052078 -11.479002 +v 190.000061 120.052078 -10.784559 +v 187.500046 -97.970467 -11.478985 +v 190.000061 120.052078 -10.784559 +v 190.000046 -98.947922 -10.784542 +v 187.500046 -97.970467 -11.478985 +v 187.500046 -97.970467 -11.478985 +v 190.000046 -98.947922 -10.784542 +v 154.000031 -134.262115 -20.784538 +v 190.000046 -98.947922 -10.784542 +v 154.000031 -137.947922 -20.784538 +v 154.000031 -134.262115 -20.784538 +v 152.905457 -135.447922 -16.681448 +v 152.905457 -135.447922 -20.784538 +v -152.905396 -135.447891 -16.681421 +v 152.905457 -135.447922 -20.784538 +v -152.905396 -135.447891 -20.784512 +v -152.905396 -135.447891 -16.681421 +v 161.500061 120.052078 -3.284557 +v -161.999939 120.052109 -0.784528 +v 162.000061 120.052078 -0.784557 +v 190.000061 120.052078 -10.784559 +v 187.500061 120.052078 -11.479002 +v 190.000061 120.052078 -5.784559 +v 187.500061 120.052078 -11.479002 +v 187.500061 120.052078 -6.297704 +v 190.000061 120.052078 -5.784559 +v 190.000061 120.052078 -5.784559 +v 187.500061 120.052078 -6.297704 +v 187.000061 120.052078 1.215441 +v 187.500061 120.052078 -6.297704 +v 185.409531 120.052078 -1.419790 +v 187.000061 120.052078 1.215441 +v 187.000061 120.052078 1.215441 +v 185.409531 120.052078 -1.419790 +v 162.000061 120.052078 -0.784557 +v 185.409531 120.052078 -1.419790 +v 162.099899 120.052078 -3.284557 +v 162.000061 120.052078 -0.784557 +v 162.000061 120.052078 -0.784557 +v 162.099899 120.052078 -3.284557 +v 161.500061 120.052078 -3.284557 +v -187.499939 120.052109 -11.478970 +v -189.999939 120.052109 -10.784527 +v -187.499939 120.052109 -6.297672 +v -189.999939 120.052109 -10.784527 +v -189.999939 120.052109 -5.784526 +v -187.499939 120.052109 -6.297672 +v -187.499939 120.052109 -6.297672 +v -189.999939 120.052109 -5.784526 +v -185.409424 120.052109 -1.419757 +v -189.999939 120.052109 -5.784526 +v -186.999939 120.052109 1.215474 +v -185.409424 120.052109 -1.419757 +v -185.409424 120.052109 -1.419757 +v -186.999939 120.052109 1.215474 +v -162.099792 120.052109 -3.284528 +v -186.999939 120.052109 1.215474 +v -161.999939 120.052109 -0.784528 +v -162.099792 120.052109 -3.284528 +v -162.099792 120.052109 -3.284528 +v -161.999939 120.052109 -0.784528 +v -161.499939 120.052109 -3.284528 +v -161.999939 120.052109 -0.784528 +v 161.500061 120.052078 -3.284557 +v -161.499939 120.052109 -3.284528 +v -161.499939 120.052109 -3.284528 +v 161.500061 120.052078 -3.284557 +v -161.499939 120.052109 -4.284528 +v 161.500061 120.052078 -3.284557 +v 161.500061 120.052078 -4.284557 +v -161.499939 120.052109 -4.284528 +v 187.000061 120.052078 1.215441 +v 162.000061 120.052078 -0.784557 +v 187.000046 -98.947922 1.215457 +v 162.000061 120.052078 -0.784557 +v 162.000046 -98.947922 -0.784541 +v 187.000046 -98.947922 1.215457 +v -154.783401 -106.447891 -3.284512 +v -155.035477 -106.447891 -3.255711 +v -155.035477 -106.447891 -4.284513 +v -154.783401 -106.447891 -3.284512 +v -155.035477 -106.447891 -4.284513 +v -103.356987 -106.447899 -3.284516 +v -155.035477 -106.447891 -4.284513 +v -103.356987 -106.447899 -4.284516 +v -103.356987 -106.447899 -3.284516 +v -103.356987 -106.447899 -3.284516 +v -103.356987 -106.447899 -4.284516 +v -51.678474 -106.447899 -3.284521 +v -103.356987 -106.447899 -4.284516 +v -51.678474 -106.447899 -4.284522 +v -51.678474 -106.447899 -3.284521 +v -51.678474 -106.447899 -3.284521 +v -51.678474 -106.447899 -4.284522 +v 0.000038 -106.447906 -3.284526 +v -51.678474 -106.447899 -4.284522 +v 0.000038 -106.447906 -4.284526 +v 0.000038 -106.447906 -3.284526 +v 0.000038 -106.447906 -3.284526 +v 0.000038 -106.447906 -4.284526 +v 51.678551 -106.447914 -3.284530 +v 0.000038 -106.447906 -4.284526 +v 51.678551 -106.447914 -4.284530 +v 51.678551 -106.447914 -3.284530 +v 51.678551 -106.447914 -3.284530 +v 51.678551 -106.447914 -4.284530 +v 103.357063 -106.447914 -3.284535 +v 51.678551 -106.447914 -4.284530 +v 103.357063 -106.447914 -4.284535 +v 103.357063 -106.447914 -3.284535 +v 103.357063 -106.447914 -3.284535 +v 103.357063 -106.447914 -4.284535 +v 154.783508 -106.447922 -3.284539 +v 103.357063 -106.447914 -4.284535 +v 155.035583 -106.447922 -4.284539 +v 154.783508 -106.447922 -3.284539 +v 154.783508 -106.447922 -3.284539 +v 155.035583 -106.447922 -4.284539 +v 155.035583 -106.447922 -3.255738 +v 161.500061 120.052078 -4.284557 +v 161.500046 -99.983452 -4.284541 +v 155.035583 -106.447922 -4.284539 +v 155.035583 -106.447922 -4.284539 +v 103.357063 -106.447914 -4.284535 +v 161.500061 120.052078 -4.284557 +v 103.357063 -106.447914 -4.284535 +v 51.678551 -106.447914 -4.284530 +v 161.500061 120.052078 -4.284557 +v 161.500061 120.052078 -4.284557 +v 51.678551 -106.447914 -4.284530 +v -161.499939 120.052109 -4.284528 +v 51.678551 -106.447914 -4.284530 +v 0.000038 -106.447906 -4.284526 +v -161.499939 120.052109 -4.284528 +v -155.035477 -106.447891 -4.284513 +v -161.499954 -99.983421 -4.284512 +v -103.356987 -106.447899 -4.284516 +v -161.499954 -99.983421 -4.284512 +v -161.499939 120.052109 -4.284528 +v -103.356987 -106.447899 -4.284516 +v -103.356987 -106.447899 -4.284516 +v -161.499939 120.052109 -4.284528 +v -51.678474 -106.447899 -4.284522 +v -161.499939 120.052109 -4.284528 +v 0.000038 -106.447906 -4.284526 +v -51.678474 -106.447899 -4.284522 +v 152.905457 -135.447922 -20.784538 +v 154.000031 -134.262115 -20.784538 +v 154.000031 -137.947922 -20.784538 +v 152.905457 -135.447922 -20.784538 +v 154.000031 -137.947922 -20.784538 +v -152.905396 -135.447891 -20.784512 +v 154.000031 -137.947922 -20.784538 +v -153.999969 -137.947891 -20.784512 +v -152.905396 -135.447891 -20.784512 +v -152.905396 -135.447891 -20.784512 +v -153.999969 -137.947891 -20.784512 +v -153.999969 -134.262085 -20.784512 +v 189.625046 -98.947922 -4.909543 +v 190.000046 -98.947922 -5.784543 +v 190.000061 120.052078 -5.784559 +v 189.625046 -98.947922 -4.909543 +v 190.000061 120.052078 -5.784559 +v 189.250046 -98.947922 -4.034543 +v 187.000061 120.052078 1.215441 +v 187.000046 -98.947922 1.215457 +v 187.375046 -98.947922 0.340457 +v 187.375046 -98.947922 0.340457 +v 187.750046 -98.947922 -0.534543 +v 187.000061 120.052078 1.215441 +v 187.750046 -98.947922 -0.534543 +v 188.500046 -98.947922 -2.284543 +v 187.000061 120.052078 1.215441 +v 187.000061 120.052078 1.215441 +v 188.500046 -98.947922 -2.284543 +v 190.000061 120.052078 -5.784559 +v 188.500046 -98.947922 -2.284543 +v 188.875046 -98.947922 -3.159543 +v 190.000061 120.052078 -5.784559 +v 190.000061 120.052078 -5.784559 +v 188.875046 -98.947922 -3.159543 +v 189.250046 -98.947922 -4.034543 +v -153.316498 -122.885239 -1.426769 +v -154.111511 -122.329681 -1.492130 +v -154.122742 -112.603630 -2.636372 +v 154.122803 -112.603661 -2.636399 +v 154.111572 -122.329712 -1.492157 +v 153.316559 -122.885269 -1.426796 +v 153.316559 -122.885269 -1.426796 +v -153.316498 -122.885239 -1.426769 +v 154.122803 -112.603661 -2.636399 +v -153.316498 -122.885239 -1.426769 +v -154.122742 -112.603630 -2.636372 +v 154.122803 -112.603661 -2.636399 +v 154.122803 -112.603661 -2.636399 +v -154.122742 -112.603630 -2.636372 +v 154.148270 -107.094475 -3.284539 +v -154.122742 -112.603630 -2.636372 +v -154.148178 -107.094444 -3.284512 +v 154.148270 -107.094475 -3.284539 +v -162.099792 120.052109 -3.284528 +v -161.499939 120.052109 -3.284528 +v -162.099808 -99.046623 -3.284512 +v -161.499939 120.052109 -3.284528 +v -161.499954 -99.651382 -3.284512 +v -162.099808 -99.046623 -3.284512 +v -153.316498 -122.885239 -1.426769 +v 153.316559 -122.885269 -1.426796 +v -153.299469 -125.894882 -5.081348 +v 153.316559 -122.885269 -1.426796 +v 153.299515 -125.894913 -5.081375 +v -153.299469 -125.894882 -5.081348 +v -153.299469 -125.894882 -5.081348 +v 153.299515 -125.894913 -5.081375 +v -153.282867 -128.977966 -8.825084 +v 153.299515 -125.894913 -5.081375 +v 153.282928 -128.977997 -8.825110 +v -153.282867 -128.977966 -8.825084 +v -153.282867 -128.977966 -8.825084 +v 153.282928 -128.977997 -8.825110 +v -153.267090 -132.061356 -12.569209 +v 153.252487 -135.071976 -16.224936 +v 152.905457 -135.447922 -16.681448 +v -152.905396 -135.447891 -16.681421 +v 153.282928 -128.977997 -8.825110 +v 153.267151 -132.061386 -12.569236 +v -153.267090 -132.061356 -12.569209 +v 153.267151 -132.061386 -12.569236 +v 153.252487 -135.071976 -16.224936 +v -153.267090 -132.061356 -12.569209 +v -153.267090 -132.061356 -12.569209 +v 153.252487 -135.071976 -16.224936 +v -153.252411 -135.071945 -16.224909 +v 153.252487 -135.071976 -16.224936 +v -152.905396 -135.447891 -16.681421 +v -153.252411 -135.071945 -16.224909 +v 161.500061 120.052078 -4.284557 +v 161.500061 120.052078 -3.284557 +v 161.500046 -99.983452 -4.284541 +v 161.500061 120.052078 -3.284557 +v 161.500046 -99.651413 -3.284541 +v 161.500046 -99.983452 -4.284541 +v 161.500046 -99.983452 -4.284541 +v 161.500046 -99.651413 -3.284541 +v 161.500046 -99.983452 -3.257288 +v -183.941238 -99.077583 -1.537196 +v -185.409439 -97.830566 -1.419741 +v -180.995377 -99.075989 -1.772868 +v -185.409439 -97.830566 -1.419741 +v -185.409424 120.052109 -1.419757 +v -180.995377 -99.075989 -1.772868 +v -180.995377 -99.075989 -1.772868 +v -185.409424 120.052109 -1.419757 +v -174.699203 -99.071297 -2.276561 +v -174.699203 -99.071297 -2.276561 +v -185.409424 120.052109 -1.419757 +v -169.582657 -99.065201 -2.685879 +v -185.409424 120.052109 -1.419757 +v -162.099792 120.052109 -3.284528 +v -169.582657 -99.065201 -2.685879 +v -169.582657 -99.065201 -2.685879 +v -162.099792 120.052109 -3.284528 +v -162.099808 -99.046623 -3.284512 +v 155.035583 -106.447922 -3.255738 +v 155.035583 -106.447922 -4.284539 +v 158.241608 -103.241898 -3.256097 +v 155.035583 -106.447922 -4.284539 +v 161.500046 -99.983452 -4.284541 +v 158.241608 -103.241898 -3.256097 +v 158.241608 -103.241898 -3.256097 +v 161.500046 -99.983452 -4.284541 +v 161.500046 -99.983452 -3.257288 +v -186.533585 -97.896790 -4.042803 +v -186.877975 -97.914192 -4.846377 +v -187.499939 120.052109 -6.297672 +v -186.877975 -97.914192 -4.846377 +v -187.069168 -97.923363 -5.292468 +v -187.499939 120.052109 -6.297672 +v -187.499939 120.052109 -6.297672 +v -187.069168 -97.923363 -5.292468 +v -187.499954 -97.942810 -6.297656 +v -185.409424 120.052109 -1.419757 +v -185.409439 -97.830566 -1.419741 +v -187.499939 120.052109 -6.297672 +v -185.409439 -97.830566 -1.419741 +v -185.495804 -97.836243 -1.621287 +v -187.499939 120.052109 -6.297672 +v -185.495804 -97.836243 -1.621287 +v -185.842484 -97.857956 -2.430239 +v -187.499939 120.052109 -6.297672 +v -185.842484 -97.857956 -2.430239 +v -186.188431 -97.878090 -3.237422 +v -187.499939 120.052109 -6.297672 +v -187.499939 120.052109 -6.297672 +v -186.188431 -97.878090 -3.237422 +v -186.533585 -97.896790 -4.042803 +v 154.148270 -107.094475 -3.284539 +v 158.650513 -110.970001 -2.393472 +v 154.122803 -112.603661 -2.636399 +v 158.650513 -110.970001 -2.393472 +v 160.458237 -117.458817 -1.493874 +v 154.122803 -112.603661 -2.636399 +v 154.122803 -112.603661 -2.636399 +v 160.458237 -117.458817 -1.493874 +v 154.111572 -122.329712 -1.492157 +v 163.553696 -106.947121 -2.395845 +v 165.245132 -113.771378 -1.496660 +v 158.650513 -110.970001 -2.393472 +v 165.245132 -113.771378 -1.496660 +v 161.198364 -116.889587 -1.494202 +v 158.650513 -110.970001 -2.393472 +v 158.650513 -110.970001 -2.393472 +v 161.198364 -116.889587 -1.494202 +v 160.458237 -117.458817 -1.493874 +v 171.129150 -109.213753 -1.502726 +v 169.653015 -110.360474 -1.500857 +v 163.553696 -106.947121 -2.395845 +v 169.653015 -110.360474 -1.500857 +v 169.315887 -110.622009 -1.500467 +v 163.553696 -106.947121 -2.395845 +v 163.553696 -106.947121 -2.395845 +v 169.315887 -110.622009 -1.500467 +v 165.245132 -113.771378 -1.496660 +v 178.799072 -103.199463 -1.518070 +v 174.699295 -99.071327 -2.276592 +v 179.572266 -102.585831 -1.520352 +v 174.699295 -99.071327 -2.276592 +v 180.995468 -99.076019 -1.772900 +v 179.572266 -102.585831 -1.520352 +v 173.391068 -107.451080 -1.506144 +v 169.582748 -99.065231 -2.685908 +v 175.440918 -105.846680 -1.509951 +v 169.582748 -99.065231 -2.685908 +v 174.699295 -99.071327 -2.276592 +v 175.440918 -105.846680 -1.509951 +v 175.440918 -105.846680 -1.509951 +v 174.699295 -99.071327 -2.276592 +v 177.501785 -104.225304 -1.514613 +v 174.699295 -99.071327 -2.276592 +v 178.799072 -103.199463 -1.518070 +v 177.501785 -104.225304 -1.514613 +v 183.941330 -99.077614 -1.537228 +v 183.762833 -99.222603 -1.536374 +v 180.995468 -99.076019 -1.772900 +v 183.762833 -99.222603 -1.536374 +v 181.658722 -100.920135 -1.527462 +v 180.995468 -99.076019 -1.772900 +v 180.995468 -99.076019 -1.772900 +v 181.658722 -100.920135 -1.527462 +v 179.572266 -102.585831 -1.520352 +v 161.500046 -99.651413 -3.284541 +v 162.099884 -99.046654 -3.284541 +v 161.500046 -99.983452 -3.257288 +v 162.099884 -99.046654 -3.284541 +v 169.582748 -99.065231 -2.685908 +v 161.500046 -99.983452 -3.257288 +v 161.500046 -99.983452 -3.257288 +v 169.582748 -99.065231 -2.685908 +v 158.241608 -103.241898 -3.256097 +v 173.391068 -107.451080 -1.506144 +v 171.129150 -109.213753 -1.502726 +v 169.582748 -99.065231 -2.685908 +v 171.129150 -109.213753 -1.502726 +v 163.553696 -106.947121 -2.395845 +v 169.582748 -99.065231 -2.685908 +v 169.582748 -99.065231 -2.685908 +v 163.553696 -106.947121 -2.395845 +v 158.241608 -103.241898 -3.256097 +v 163.553696 -106.947121 -2.395845 +v 158.650513 -110.970001 -2.393472 +v 158.241608 -103.241898 -3.256097 +v 158.241608 -103.241898 -3.256097 +v 158.650513 -110.970001 -2.393472 +v 155.035583 -106.447922 -3.255738 +v 158.650513 -110.970001 -2.393472 +v 154.148270 -107.094475 -3.284539 +v 155.035583 -106.447922 -3.255738 +v 155.035583 -106.447922 -3.255738 +v 154.148270 -107.094475 -3.284539 +v 154.783508 -106.447922 -3.284539 +v 186.533676 -97.896820 -4.042836 +v 186.878067 -97.914223 -4.846409 +v 187.500061 115.052078 -6.297704 +v 186.878067 -97.914223 -4.846409 +v 187.069260 -97.923393 -5.292500 +v 187.500061 115.052078 -6.297704 +v 187.500061 115.052078 -6.297704 +v 187.069260 -97.923393 -5.292500 +v 187.500046 -97.942841 -6.297688 +v 185.409531 115.052078 -1.419790 +v 185.409515 -97.830597 -1.419774 +v 187.500061 115.052078 -6.297704 +v 185.409515 -97.830597 -1.419774 +v 185.495880 -97.836273 -1.621319 +v 187.500061 115.052078 -6.297704 +v 185.495880 -97.836273 -1.621319 +v 185.842590 -97.857986 -2.430272 +v 187.500061 115.052078 -6.297704 +v 185.842590 -97.857986 -2.430272 +v 186.188522 -97.878120 -3.237454 +v 187.500061 115.052078 -6.297704 +v 187.500061 115.052078 -6.297704 +v 186.188522 -97.878120 -3.237454 +v 186.533676 -97.896820 -4.042836 +v 162.099899 115.052078 -3.284557 +v 161.500061 115.052078 -3.284557 +v 162.099884 -99.046654 -3.284541 +v 161.500061 115.052078 -3.284557 +v 161.500046 -99.651413 -3.284541 +v 162.099884 -99.046654 -3.284541 +v 187.500046 -97.970467 -11.478985 +v 187.500061 115.052078 -11.479001 +v 187.500046 -97.970467 -6.362233 +v 187.500061 115.052078 -11.479001 +v 187.500061 115.052078 -6.297704 +v 187.500046 -97.970467 -6.362233 +v 187.500046 -97.970467 -6.362233 +v 187.500061 115.052078 -6.297704 +v 187.500046 -97.942841 -6.297688 +v 176.106552 -107.461143 -5.098422 +v 178.192627 -105.483414 -4.733119 +v 177.734619 -104.649673 -2.600573 +v 187.069260 -97.923393 -5.292500 +v 186.878067 -97.914223 -4.846409 +v 185.019821 -99.815674 -5.318852 +v 154.111572 -122.329712 -1.492157 +v 153.316559 -122.885269 -1.426796 +v 153.299515 -125.894913 -5.081375 +v 161.323425 -118.942223 -4.312348 +v 153.299515 -125.894913 -5.081375 +v 153.282928 -128.977997 -8.825110 +v 154.111572 -122.329712 -1.492157 +v 153.299515 -125.894913 -5.081375 +v 160.458237 -117.458817 -1.493874 +v 153.299515 -125.894913 -5.081375 +v 161.323425 -118.942223 -4.312348 +v 160.458237 -117.458817 -1.493874 +v 160.458237 -117.458817 -1.493874 +v 161.323425 -118.942223 -4.312348 +v 161.198364 -116.889587 -1.494202 +v 161.323425 -118.942223 -4.312348 +v 165.432800 -115.374489 -3.906801 +v 161.198364 -116.889587 -1.494202 +v 161.198364 -116.889587 -1.494202 +v 165.432800 -115.374489 -3.906801 +v 165.245132 -113.771378 -1.496660 +v 173.391068 -107.451080 -1.506144 +v 171.129150 -109.213753 -1.502726 +v 169.538467 -111.803581 -3.489771 +v 171.129150 -109.213753 -1.502726 +v 169.653015 -110.360474 -1.500857 +v 169.538467 -111.803581 -3.489771 +v 169.653015 -110.360474 -1.500857 +v 169.315887 -110.622009 -1.500467 +v 169.538467 -111.803581 -3.489771 +v 169.538467 -111.803581 -3.489771 +v 169.315887 -110.622009 -1.500467 +v 165.245132 -113.771378 -1.496660 +v 169.538467 -111.803581 -3.489771 +v 173.639450 -108.228867 -3.056727 +v 173.391068 -107.451080 -1.506144 +v 173.639450 -108.228867 -3.056727 +v 175.687851 -106.439857 -2.832133 +v 173.391068 -107.451080 -1.506144 +v 173.391068 -107.451080 -1.506144 +v 175.687851 -106.439857 -2.832133 +v 175.440918 -105.846680 -1.509951 +v 183.941330 -99.077614 -1.537228 +v 183.762833 -99.222603 -1.536374 +v 183.863708 -99.272209 -1.845417 +v 183.762833 -99.222603 -1.536374 +v 181.658722 -100.920135 -1.527462 +v 183.863708 -99.272209 -1.845417 +v 183.863708 -99.272209 -1.845417 +v 181.658722 -100.920135 -1.527462 +v 181.822647 -101.065712 -2.109654 +v 181.658722 -100.920135 -1.527462 +v 179.572266 -102.585831 -1.520352 +v 181.822647 -101.065712 -2.109654 +v 181.822647 -101.065712 -2.109654 +v 179.572266 -102.585831 -1.520352 +v 179.779572 -102.858269 -2.360446 +v 179.572266 -102.585831 -1.520352 +v 178.799072 -103.199463 -1.518070 +v 179.779572 -102.858269 -2.360446 +v 179.779572 -102.858269 -2.360446 +v 178.799072 -103.199463 -1.518070 +v 177.734619 -104.649673 -2.600573 +v 178.799072 -103.199463 -1.518070 +v 177.501785 -104.225304 -1.514613 +v 177.734619 -104.649673 -2.600573 +v 185.409515 -97.830597 -1.419774 +v 183.941330 -99.077614 -1.537228 +v 184.883530 -98.375237 -1.707150 +v 183.941330 -99.077614 -1.537228 +v 183.863708 -99.272209 -1.845417 +v 184.883530 -98.375237 -1.707150 +v 184.883530 -98.375237 -1.707150 +v 183.863708 -99.272209 -1.845417 +v 184.150391 -99.409630 -2.714413 +v 183.863708 -99.272209 -1.845417 +v 181.822647 -101.065712 -2.109654 +v 184.150391 -99.409630 -2.714413 +v 185.179779 -98.466270 -2.544049 +v 185.842590 -97.857986 -2.430272 +v 185.495880 -97.836273 -1.621319 +v 184.728592 -99.681305 -4.451085 +v 186.533676 -97.896820 -4.042836 +v 185.477844 -98.556107 -3.380337 +v 186.533676 -97.896820 -4.042836 +v 186.188522 -97.878120 -3.237454 +v 185.477844 -98.556107 -3.380337 +v 185.477844 -98.556107 -3.380337 +v 186.188522 -97.878120 -3.237454 +v 185.842590 -97.857986 -2.430272 +v 187.069260 -97.923393 -5.292500 +v 185.019821 -99.815674 -5.318852 +v 187.500046 -97.942841 -6.297688 +v 185.019821 -99.815674 -5.318852 +v 185.703247 -99.916985 -6.898839 +v 187.500046 -97.942841 -6.297688 +v 187.500046 -97.942841 -6.297688 +v 185.703247 -99.916985 -6.898839 +v 187.500046 -97.970467 -6.362233 +v 176.529160 -108.480431 -7.364817 +v 179.084702 -107.087090 -8.845135 +v 178.654938 -106.314781 -6.865558 +v 179.084702 -107.087090 -8.845135 +v 181.245865 -104.745819 -8.213993 +v 178.654938 -106.314781 -6.865558 +v 178.654938 -106.314781 -6.865558 +v 181.245865 -104.745819 -8.213993 +v 180.778763 -104.148651 -6.359241 +v 181.245865 -104.745819 -8.213993 +v 183.406708 -102.404900 -7.578969 +v 180.778763 -104.148651 -6.359241 +v 180.778763 -104.148651 -6.359241 +v 183.406708 -102.404900 -7.578969 +v 182.900436 -101.982193 -5.844326 +v 183.406708 -102.404900 -7.578969 +v 185.567154 -100.064423 -6.939313 +v 182.900436 -101.982193 -5.844326 +v 176.923264 -109.428635 -9.472987 +v 174.401611 -110.645554 -7.858225 +v 174.863373 -111.660179 -10.068674 +v 174.401611 -110.645554 -7.858225 +v 170.141937 -114.974113 -8.831147 +v 174.863373 -111.660179 -10.068674 +v 174.863373 -111.660179 -10.068674 +v 170.141937 -114.974113 -8.831147 +v 170.243759 -116.664764 -11.396920 +v 170.141937 -114.974113 -8.831147 +v 165.877136 -119.300522 -9.789964 +v 170.243759 -116.664764 -11.396920 +v 170.243759 -116.664764 -11.396920 +v 165.877136 -119.300522 -9.789964 +v 166.091217 -121.163330 -12.583727 +v 165.877136 -119.300522 -9.789964 +v 161.608215 -123.625000 -10.738396 +v 166.091217 -121.163330 -12.583727 +v 166.091217 -121.163330 -12.583727 +v 161.608215 -123.625000 -10.738396 +v 161.747787 -125.868729 -13.819588 +v 161.608215 -123.625000 -10.738396 +v 153.252487 -135.071976 -16.224936 +v 161.747787 -125.868729 -13.819588 +v 169.838745 -113.389473 -6.160280 +v 165.432800 -115.374489 -3.906801 +v 165.653732 -117.337975 -6.848184 +v 165.432800 -115.374489 -3.906801 +v 161.323425 -118.942223 -4.312348 +v 165.653732 -117.337975 -6.848184 +v 165.653732 -117.337975 -6.848184 +v 161.323425 -118.942223 -4.312348 +v 161.464783 -121.283974 -7.525170 +v 161.323425 -118.942223 -4.312348 +v 153.282928 -128.977997 -8.825110 +v 161.464783 -121.283974 -7.525170 +v 161.464783 -121.283974 -7.525170 +v 153.282928 -128.977997 -8.825110 +v 153.267151 -132.061386 -12.569236 +v 185.842590 -97.857986 -2.430272 +v 185.179779 -98.466270 -2.544049 +v 185.477844 -98.556107 -3.380337 +v 185.179779 -98.466270 -2.544049 +v 184.438721 -99.545975 -3.582959 +v 185.477844 -98.556107 -3.380337 +v 185.477844 -98.556107 -3.380337 +v 184.438721 -99.545975 -3.582959 +v 184.728592 -99.681305 -4.451085 +v 177.734619 -104.649673 -2.600573 +v 178.192627 -105.483414 -4.733119 +v 179.779572 -102.858269 -2.360446 +v 178.192627 -105.483414 -4.733119 +v 180.276779 -103.504875 -4.360049 +v 179.779572 -102.858269 -2.360446 +v 179.779572 -102.858269 -2.360446 +v 180.276779 -103.504875 -4.360049 +v 181.822647 -101.065712 -2.109654 +v 180.276779 -103.504875 -4.360049 +v 182.358841 -101.525650 -3.977444 +v 181.822647 -101.065712 -2.109654 +v 181.822647 -101.065712 -2.109654 +v 182.358841 -101.525650 -3.977444 +v 184.150391 -99.409630 -2.714413 +v 165.245132 -113.771378 -1.496660 +v 165.432800 -115.374489 -3.906801 +v 169.538467 -111.803581 -3.489771 +v 165.432800 -115.374489 -3.906801 +v 169.838745 -113.389473 -6.160280 +v 169.538467 -111.803581 -3.489771 +v 169.538467 -111.803581 -3.489771 +v 169.838745 -113.389473 -6.160280 +v 173.639450 -108.228867 -3.056727 +v 169.838745 -113.389473 -6.160280 +v 174.018784 -109.438065 -5.457362 +v 173.639450 -108.228867 -3.056727 +v 173.639450 -108.228867 -3.056727 +v 174.018784 -109.438065 -5.457362 +v 175.687851 -106.439857 -2.832133 +v 186.878067 -97.914223 -4.846409 +v 186.533676 -97.896820 -4.042836 +v 185.019821 -99.815674 -5.318852 +v 186.533676 -97.896820 -4.042836 +v 184.728592 -99.681305 -4.451085 +v 185.019821 -99.815674 -5.318852 +v 185.019821 -99.815674 -5.318852 +v 184.728592 -99.681305 -4.451085 +v 182.358841 -101.525650 -3.977444 +v 184.728592 -99.681305 -4.451085 +v 184.438721 -99.545975 -3.582959 +v 182.358841 -101.525650 -3.977444 +v 182.358841 -101.525650 -3.977444 +v 184.438721 -99.545975 -3.582959 +v 184.150391 -99.409630 -2.714413 +v 184.438721 -99.545975 -3.582959 +v 185.179779 -98.466270 -2.544049 +v 184.150391 -99.409630 -2.714413 +v 184.150391 -99.409630 -2.714413 +v 185.179779 -98.466270 -2.544049 +v 184.883530 -98.375237 -1.707150 +v 185.179779 -98.466270 -2.544049 +v 185.495880 -97.836273 -1.621319 +v 184.883530 -98.375237 -1.707150 +v 184.883530 -98.375237 -1.707150 +v 185.495880 -97.836273 -1.621319 +v 185.409515 -97.830597 -1.419774 +v 176.106552 -107.461143 -5.098422 +v 174.401611 -110.645554 -7.858225 +v 176.529160 -108.480431 -7.364817 +v 174.401611 -110.645554 -7.858225 +v 176.923264 -109.428635 -9.472987 +v 176.529160 -108.480431 -7.364817 +v 176.529160 -108.480431 -7.364817 +v 176.923264 -109.428635 -9.472987 +v 179.084702 -107.087090 -8.845135 +v 176.106552 -107.461143 -5.098422 +v 176.529160 -108.480431 -7.364817 +v 178.192627 -105.483414 -4.733119 +v 176.529160 -108.480431 -7.364817 +v 178.654938 -106.314781 -6.865558 +v 178.192627 -105.483414 -4.733119 +v 178.192627 -105.483414 -4.733119 +v 178.654938 -106.314781 -6.865558 +v 180.276779 -103.504875 -4.360049 +v 178.654938 -106.314781 -6.865558 +v 180.778763 -104.148651 -6.359241 +v 180.276779 -103.504875 -4.360049 +v 180.276779 -103.504875 -4.360049 +v 180.778763 -104.148651 -6.359241 +v 182.358841 -101.525650 -3.977444 +v 180.778763 -104.148651 -6.359241 +v 182.900436 -101.982193 -5.844326 +v 182.358841 -101.525650 -3.977444 +v 182.358841 -101.525650 -3.977444 +v 182.900436 -101.982193 -5.844326 +v 185.019821 -99.815674 -5.318852 +v 182.900436 -101.982193 -5.844326 +v 185.567154 -100.064423 -6.939313 +v 185.019821 -99.815674 -5.318852 +v 185.019821 -99.815674 -5.318852 +v 185.567154 -100.064423 -6.939313 +v 185.703247 -99.916985 -6.898839 +v 177.501785 -104.225304 -1.514613 +v 175.440918 -105.846680 -1.509951 +v 177.734619 -104.649673 -2.600573 +v 175.440918 -105.846680 -1.509951 +v 175.687851 -106.439857 -2.832133 +v 177.734619 -104.649673 -2.600573 +v 177.734619 -104.649673 -2.600573 +v 175.687851 -106.439857 -2.832133 +v 176.106552 -107.461143 -5.098422 +v 175.687851 -106.439857 -2.832133 +v 174.018784 -109.438065 -5.457362 +v 176.106552 -107.461143 -5.098422 +v 176.106552 -107.461143 -5.098422 +v 174.018784 -109.438065 -5.457362 +v 174.401611 -110.645554 -7.858225 +v 174.018784 -109.438065 -5.457362 +v 169.838745 -113.389473 -6.160280 +v 174.401611 -110.645554 -7.858225 +v 174.401611 -110.645554 -7.858225 +v 169.838745 -113.389473 -6.160280 +v 170.141937 -114.974113 -8.831147 +v 169.838745 -113.389473 -6.160280 +v 165.653732 -117.337975 -6.848184 +v 170.141937 -114.974113 -8.831147 +v 170.141937 -114.974113 -8.831147 +v 165.653732 -117.337975 -6.848184 +v 165.877136 -119.300522 -9.789964 +v 165.653732 -117.337975 -6.848184 +v 161.464783 -121.283974 -7.525170 +v 165.877136 -119.300522 -9.789964 +v 165.877136 -119.300522 -9.789964 +v 161.464783 -121.283974 -7.525170 +v 161.608215 -123.625000 -10.738396 +v 161.464783 -121.283974 -7.525170 +v 153.267151 -132.061386 -12.569236 +v 161.608215 -123.625000 -10.738396 +v 161.608215 -123.625000 -10.738396 +v 153.267151 -132.061386 -12.569236 +v 153.252487 -135.071976 -16.224936 +v 161.500061 115.052078 -3.284557 +v 161.500061 115.052078 -4.284557 +v 161.500046 -99.651413 -3.284541 +v 161.500061 115.052078 -4.284557 +v 161.500046 -99.983452 -4.284541 +v 161.500046 -99.651413 -3.284541 +v 161.500046 -99.651413 -3.284541 +v 161.500046 -99.983452 -4.284541 +v 161.500046 -99.983452 -3.257288 +v 157.535583 -103.947922 -4.284539 +v 155.035583 -106.447922 -4.284539 +v 157.535583 -103.947922 -3.255921 +v 155.035583 -106.447922 -4.284539 +v 155.035583 -106.447922 -3.255738 +v 157.535583 -103.947922 -3.255921 +v 187.500046 -97.970467 -6.362233 +v 185.703247 -99.916985 -6.898839 +v 187.500046 -97.970467 -11.478985 +v 185.703247 -99.916985 -6.898839 +v 185.567154 -100.064423 -6.939313 +v 187.500046 -97.970467 -11.478985 +v 187.500046 -97.970467 -11.478985 +v 185.567154 -100.064423 -6.939313 +v 183.406708 -102.404900 -7.578969 +v 183.406708 -102.404900 -7.578969 +v 181.245865 -104.745819 -8.213993 +v 187.500046 -97.970467 -11.478985 +v 181.245865 -104.745819 -8.213993 +v 179.084702 -107.087090 -8.845135 +v 187.500046 -97.970467 -11.478985 +v 187.500046 -97.970467 -11.478985 +v 179.084702 -107.087090 -8.845135 +v 176.923264 -109.428635 -9.472987 +v 166.091217 -121.163330 -12.583727 +v 154.000031 -134.262115 -20.784538 +v 170.243759 -116.664764 -11.396920 +v 154.000031 -134.262115 -20.784538 +v 187.500046 -97.970467 -11.478985 +v 170.243759 -116.664764 -11.396920 +v 170.243759 -116.664764 -11.396920 +v 187.500046 -97.970467 -11.478985 +v 174.863373 -111.660179 -10.068674 +v 187.500046 -97.970467 -11.478985 +v 176.923264 -109.428635 -9.472987 +v 174.863373 -111.660179 -10.068674 +v 152.905457 -135.447922 -16.681448 +v 152.905457 -135.447922 -20.784538 +v 153.252487 -135.071976 -16.224936 +v 152.905457 -135.447922 -20.784538 +v 154.000031 -134.262115 -20.784538 +v 153.252487 -135.071976 -16.224936 +v 153.252487 -135.071976 -16.224936 +v 154.000031 -134.262115 -20.784538 +v 161.747787 -125.868729 -13.819588 +v 154.000031 -134.262115 -20.784538 +v 166.091217 -121.163330 -12.583727 +v 161.747787 -125.868729 -13.819588 +v 159.000046 -103.947922 -3.115808 +v 157.535583 -103.947922 -3.255921 +v 155.035583 -106.447922 -3.255738 +v 161.500046 -99.983452 -3.257288 +v 159.000046 -102.483459 -3.256333 +v 159.000046 -103.947922 -3.115808 +v 183.762833 -99.222603 -1.536374 +v 183.941330 -99.077614 -1.537228 +v 180.995468 -99.076019 -1.772900 +v 177.501785 -104.225304 -1.514613 +v 178.799072 -103.199463 -1.518070 +v 174.699295 -99.071327 -2.276592 +v 178.799072 -103.199463 -1.518070 +v 179.572266 -102.585831 -1.520352 +v 174.699295 -99.071327 -2.276592 +v 174.699295 -99.071327 -2.276592 +v 179.572266 -102.585831 -1.520352 +v 180.995468 -99.076019 -1.772900 +v 179.572266 -102.585831 -1.520352 +v 181.658722 -100.920135 -1.527462 +v 180.995468 -99.076019 -1.772900 +v 180.995468 -99.076019 -1.772900 +v 181.658722 -100.920135 -1.527462 +v 183.762833 -99.222603 -1.536374 +v 169.582748 -99.065231 -2.685908 +v 163.553696 -106.947121 -2.395845 +v 169.653015 -110.360474 -1.500857 +v 169.653015 -110.360474 -1.500857 +v 171.129150 -109.213753 -1.502726 +v 169.582748 -99.065231 -2.685908 +v 171.129150 -109.213753 -1.502726 +v 173.391068 -107.451080 -1.506144 +v 169.582748 -99.065231 -2.685908 +v 169.582748 -99.065231 -2.685908 +v 173.391068 -107.451080 -1.506144 +v 174.699295 -99.071327 -2.276592 +v 173.391068 -107.451080 -1.506144 +v 175.440918 -105.846680 -1.509951 +v 174.699295 -99.071327 -2.276592 +v 174.699295 -99.071327 -2.276592 +v 175.440918 -105.846680 -1.509951 +v 177.501785 -104.225304 -1.514613 +v 160.458237 -117.458817 -1.493874 +v 161.198364 -116.889587 -1.494202 +v 158.650513 -110.970001 -2.393472 +v 161.198364 -116.889587 -1.494202 +v 165.245132 -113.771378 -1.496660 +v 158.650513 -110.970001 -2.393472 +v 158.650513 -110.970001 -2.393472 +v 165.245132 -113.771378 -1.496660 +v 163.553696 -106.947121 -2.395845 +v 165.245132 -113.771378 -1.496660 +v 169.315887 -110.622009 -1.500467 +v 163.553696 -106.947121 -2.395845 +v 163.553696 -106.947121 -2.395845 +v 169.315887 -110.622009 -1.500467 +v 169.653015 -110.360474 -1.500857 +v 154.111572 -122.329712 -1.492157 +v 160.458237 -117.458817 -1.493874 +v 154.122803 -112.603661 -2.636399 +v 160.458237 -117.458817 -1.493874 +v 158.650513 -110.970001 -2.393472 +v 154.122803 -112.603661 -2.636399 +v 154.122803 -112.603661 -2.636399 +v 158.650513 -110.970001 -2.393472 +v 154.148270 -107.094475 -3.284539 +v 158.650513 -110.970001 -2.393472 +v 154.783508 -106.447922 -3.284539 +v 154.148270 -107.094475 -3.284539 +v 162.099884 -99.046654 -3.284541 +v 161.500046 -99.651413 -3.284541 +v 169.582748 -99.065231 -2.685908 +v 161.500046 -99.651413 -3.284541 +v 161.500046 -99.983452 -3.257288 +v 169.582748 -99.065231 -2.685908 +v 169.582748 -99.065231 -2.685908 +v 161.500046 -99.983452 -3.257288 +v 163.553696 -106.947121 -2.395845 +v 161.500046 -99.983452 -3.257288 +v 159.000046 -103.947922 -3.115808 +v 163.553696 -106.947121 -2.395845 +v 163.553696 -106.947121 -2.395845 +v 159.000046 -103.947922 -3.115808 +v 158.650513 -110.970001 -2.393472 +v 159.000046 -103.947922 -3.115808 +v 155.035583 -106.447922 -3.255738 +v 158.650513 -110.970001 -2.393472 +v 158.650513 -110.970001 -2.393472 +v 155.035583 -106.447922 -3.255738 +v 154.783508 -106.447922 -3.284539 +v 159.000046 -102.483459 -3.256333 +v 161.500046 -99.983452 -3.257288 +v 159.000046 -102.483459 -4.284539 +v 161.500046 -99.983452 -3.257288 +v 161.500046 -99.983452 -4.284541 +v 159.000046 -102.483459 -4.284539 +v 167.658310 -110.952873 -5.347849 +v 159.567749 -105.451286 -5.995095 +v 168.184830 -110.499100 -5.305727 +v 159.567749 -105.451286 -5.995095 +v 162.500046 -102.518990 -5.760515 +v 168.184830 -110.499100 -5.305727 +v 168.184830 -110.499100 -5.305727 +v 162.500046 -102.518990 -5.760515 +v 172.143524 -107.078400 -4.989039 +v 162.500061 115.052078 -5.760532 +v 174.905914 -104.679207 -4.768046 +v 162.500046 -102.518990 -5.760515 +v 174.905914 -104.679207 -4.768046 +v 174.137375 -105.347946 -4.829531 +v 162.500046 -102.518990 -5.760515 +v 162.500046 -102.518990 -5.760515 +v 174.137375 -105.347946 -4.829531 +v 172.143524 -107.078400 -4.989039 +v 162.500061 115.052078 -5.760532 +v 181.138855 -99.203865 -4.269413 +v 180.156525 -100.074593 -4.347996 +v 183.819000 115.052078 -4.055021 +v 183.818985 -96.806648 -4.055005 +v 162.500061 115.052078 -5.760532 +v 183.818985 -96.806648 -4.055005 +v 182.193665 -98.264488 -4.185024 +v 162.500061 115.052078 -5.760532 +v 162.500061 115.052078 -5.760532 +v 182.193665 -98.264488 -4.185024 +v 181.138855 -99.203865 -4.269413 +v 180.156525 -100.074593 -4.347996 +v 178.135254 -101.855858 -4.509700 +v 162.500061 115.052078 -5.760532 +v 178.135254 -101.855858 -4.509700 +v 176.130905 -103.610954 -4.670046 +v 162.500061 115.052078 -5.760532 +v 162.500061 115.052078 -5.760532 +v 176.130905 -103.610954 -4.670046 +v 174.905914 -104.679207 -4.768046 +v 162.500061 115.052078 -5.760532 +v 162.500046 -102.518990 -5.760515 +v 162.500061 115.052078 -6.784557 +v 162.500046 -102.518990 -5.760515 +v 162.500046 -102.518990 -6.784540 +v 162.500061 115.052078 -6.784557 +v 157.571091 -107.447922 -5.760202 +v 157.571091 -107.447922 -6.784539 +v 159.567749 -105.451286 -5.995095 +v 157.571091 -107.447922 -6.784539 +v 162.500046 -102.518990 -6.784540 +v 159.567749 -105.451286 -5.995095 +v 159.567749 -105.451286 -5.995095 +v 162.500046 -102.518990 -6.784540 +v 162.500046 -102.518990 -5.760515 +v 159.000061 113.052078 -4.284555 +v 159.000061 113.052078 -6.784555 +v 159.000046 -102.483459 -4.284539 +v 159.000061 113.052078 -6.784555 +v 159.000046 -103.947922 -6.784539 +v 159.000046 -102.483459 -4.284539 +v 159.000046 -102.483459 -4.284539 +v 159.000046 -103.947922 -6.784539 +v 159.000046 -102.483459 -3.256333 +v 159.000046 -103.947922 -6.784539 +v 159.000046 -103.947922 -3.115808 +v 159.000046 -102.483459 -3.256333 +v 183.941330 -99.077614 -1.537228 +v 185.409515 -97.830597 -1.419774 +v 180.995468 -99.076019 -1.772900 +v 185.409515 -97.830597 -1.419774 +v 185.409531 115.052078 -1.419790 +v 180.995468 -99.076019 -1.772900 +v 180.995468 -99.076019 -1.772900 +v 185.409531 115.052078 -1.419790 +v 174.699295 -99.071327 -2.276592 +v 174.699295 -99.071327 -2.276592 +v 185.409531 115.052078 -1.419790 +v 169.582748 -99.065231 -2.685908 +v 185.409531 115.052078 -1.419790 +v 162.099899 115.052078 -3.284557 +v 169.582748 -99.065231 -2.685908 +v 169.582748 -99.065231 -2.685908 +v 162.099899 115.052078 -3.284557 +v 162.099884 -99.046654 -3.284541 +v 157.571091 -107.447922 -6.784539 +v 157.571091 -107.447922 -5.760202 +v -157.571014 -107.447891 -6.784512 +v 157.571091 -107.447922 -5.760202 +v -157.571014 -107.447891 -5.760174 +v -157.571014 -107.447891 -6.784512 +v -184.728500 -99.681274 -4.451052 +v -185.019730 -99.815643 -5.318820 +v -182.900345 -101.982162 -5.844294 +v -187.499954 -97.970436 -6.362200 +v -185.703140 -99.916954 -6.898806 +v -187.499954 -97.942810 -6.297656 +v -185.703140 -99.916954 -6.898806 +v -185.019730 -99.815643 -5.318820 +v -187.499954 -97.942810 -6.297656 +v -187.499954 -97.942810 -6.297656 +v -185.019730 -99.815643 -5.318820 +v -187.069168 -97.923363 -5.292468 +v -187.069168 -97.923363 -5.292468 +v -185.019730 -99.815643 -5.318820 +v -186.877975 -97.914192 -4.846377 +v -185.019730 -99.815643 -5.318820 +v -184.728500 -99.681274 -4.451052 +v -186.877975 -97.914192 -4.846377 +v -186.877975 -97.914192 -4.846377 +v -184.728500 -99.681274 -4.451052 +v -186.533585 -97.896790 -4.042803 +v -183.863602 -99.272179 -1.845385 +v -183.941238 -99.077583 -1.537196 +v -184.883438 -98.375206 -1.707118 +v -183.941238 -99.077583 -1.537196 +v -185.409439 -97.830566 -1.419741 +v -184.883438 -98.375206 -1.707118 +v -179.779495 -102.858238 -2.360415 +v -181.658646 -100.920105 -1.527430 +v -181.822556 -101.065681 -2.109622 +v -181.658646 -100.920105 -1.527430 +v -183.762741 -99.222572 -1.536342 +v -181.822556 -101.065681 -2.109622 +v -177.501694 -104.225273 -1.514582 +v -178.798965 -103.199432 -1.518039 +v -179.779495 -102.858238 -2.360415 +v -178.798965 -103.199432 -1.518039 +v -179.572159 -102.585800 -1.520319 +v -179.779495 -102.858238 -2.360415 +v -179.779495 -102.858238 -2.360415 +v -179.572159 -102.585800 -1.520319 +v -181.658646 -100.920105 -1.527430 +v -173.639374 -108.228836 -3.056697 +v -175.440811 -105.846649 -1.509921 +v -175.687759 -106.439827 -2.832102 +v -175.440811 -105.846649 -1.509921 +v -177.501694 -104.225273 -1.514582 +v -175.687759 -106.439827 -2.832102 +v -175.687759 -106.439827 -2.832102 +v -177.501694 -104.225273 -1.514582 +v -177.734512 -104.649643 -2.600542 +v -177.501694 -104.225273 -1.514582 +v -179.779495 -102.858238 -2.360415 +v -177.734512 -104.649643 -2.600542 +v -169.538422 -111.803551 -3.489741 +v -171.129089 -109.213722 -1.502696 +v -173.639374 -108.228836 -3.056697 +v -171.129089 -109.213722 -1.502696 +v -173.391022 -107.451050 -1.506114 +v -173.639374 -108.228836 -3.056697 +v -173.639374 -108.228836 -3.056697 +v -173.391022 -107.451050 -1.506114 +v -175.440811 -105.846649 -1.509921 +v -161.323364 -118.942192 -4.312319 +v -165.245087 -113.771347 -1.496631 +v -165.432739 -115.374458 -3.906771 +v -165.245087 -113.771347 -1.496631 +v -169.315826 -110.621979 -1.500438 +v -165.432739 -115.374458 -3.906771 +v -165.432739 -115.374458 -3.906771 +v -169.315826 -110.621979 -1.500438 +v -169.538422 -111.803551 -3.489741 +v -169.315826 -110.621979 -1.500438 +v -169.652954 -110.360443 -1.500827 +v -169.538422 -111.803551 -3.489741 +v -169.538422 -111.803551 -3.489741 +v -169.652954 -110.360443 -1.500827 +v -171.129089 -109.213722 -1.502696 +v -154.111511 -122.329681 -1.492130 +v -160.458160 -117.458786 -1.493846 +v -161.323364 -118.942192 -4.312319 +v -160.458160 -117.458786 -1.493846 +v -161.198303 -116.889557 -1.494174 +v -161.323364 -118.942192 -4.312319 +v -161.323364 -118.942192 -4.312319 +v -161.198303 -116.889557 -1.494174 +v -165.245087 -113.771347 -1.496631 +v -161.464722 -121.283943 -7.525141 +v -153.282867 -128.977966 -8.825084 +v -153.299469 -125.894882 -5.081348 +v -185.703140 -99.916954 -6.898806 +v -185.567062 -100.064392 -6.939280 +v -185.019730 -99.815643 -5.318820 +v -185.567062 -100.064392 -6.939280 +v -183.406631 -102.404869 -7.578935 +v -185.019730 -99.815643 -5.318820 +v -185.019730 -99.815643 -5.318820 +v -183.406631 -102.404869 -7.578935 +v -182.900345 -101.982162 -5.844294 +v -183.406631 -102.404869 -7.578935 +v -181.245773 -104.745789 -8.213961 +v -182.900345 -101.982162 -5.844294 +v -182.900345 -101.982162 -5.844294 +v -181.245773 -104.745789 -8.213961 +v -180.778671 -104.148621 -6.359210 +v -181.245773 -104.745789 -8.213961 +v -179.084610 -107.087059 -8.845102 +v -180.778671 -104.148621 -6.359210 +v -180.778671 -104.148621 -6.359210 +v -179.084610 -107.087059 -8.845102 +v -178.654861 -106.314751 -6.865526 +v -179.084610 -107.087059 -8.845102 +v -176.923187 -109.428604 -9.472957 +v -178.654861 -106.314751 -6.865526 +v -178.654861 -106.314751 -6.865526 +v -176.923187 -109.428604 -9.472957 +v -176.529083 -108.480400 -7.364787 +v -176.923187 -109.428604 -9.472957 +v -174.863312 -111.660149 -10.068644 +v -176.529083 -108.480400 -7.364787 +v -176.529083 -108.480400 -7.364787 +v -174.863312 -111.660149 -10.068644 +v -174.401550 -110.645523 -7.858195 +v -174.863312 -111.660149 -10.068644 +v -170.243683 -116.664734 -11.396892 +v -174.401550 -110.645523 -7.858195 +v -153.252411 -135.071945 -16.224909 +v -153.267090 -132.061356 -12.569209 +v -161.747711 -125.868698 -13.819559 +v -153.267090 -132.061356 -12.569209 +v -161.608154 -123.624969 -10.738367 +v -161.747711 -125.868698 -13.819559 +v -161.747711 -125.868698 -13.819559 +v -161.608154 -123.624969 -10.738367 +v -166.091156 -121.163300 -12.583697 +v -161.608154 -123.624969 -10.738367 +v -165.877075 -119.300491 -9.789935 +v -166.091156 -121.163300 -12.583697 +v -166.091156 -121.163300 -12.583697 +v -165.877075 -119.300491 -9.789935 +v -170.141876 -114.974083 -8.831119 +v -165.877075 -119.300491 -9.789935 +v -169.838684 -113.389442 -6.160251 +v -170.141876 -114.974083 -8.831119 +v -170.141876 -114.974083 -8.831119 +v -169.838684 -113.389442 -6.160251 +v -174.018707 -109.438034 -5.457331 +v -153.316498 -122.885239 -1.426769 +v -154.111511 -122.329681 -1.492130 +v -153.299469 -125.894882 -5.081348 +v -154.111511 -122.329681 -1.492130 +v -161.323364 -118.942192 -4.312319 +v -153.299469 -125.894882 -5.081348 +v -153.299469 -125.894882 -5.081348 +v -161.323364 -118.942192 -4.312319 +v -161.464722 -121.283943 -7.525141 +v -161.323364 -118.942192 -4.312319 +v -165.432739 -115.374458 -3.906771 +v -161.464722 -121.283943 -7.525141 +v -161.464722 -121.283943 -7.525141 +v -165.432739 -115.374458 -3.906771 +v -165.653656 -117.337944 -6.848155 +v -165.432739 -115.374458 -3.906771 +v -169.538422 -111.803551 -3.489741 +v -165.653656 -117.337944 -6.848155 +v -184.438614 -99.545944 -3.582926 +v -184.150284 -99.409599 -2.714381 +v -185.477737 -98.556076 -3.380305 +v -184.150284 -99.409599 -2.714381 +v -185.179703 -98.466240 -2.544017 +v -185.477737 -98.556076 -3.380305 +v -184.438614 -99.545944 -3.582926 +v -182.358749 -101.525620 -3.977412 +v -184.150284 -99.409599 -2.714381 +v -182.358749 -101.525620 -3.977412 +v -183.863602 -99.272179 -1.845385 +v -184.150284 -99.409599 -2.714381 +v -184.150284 -99.409599 -2.714381 +v -183.863602 -99.272179 -1.845385 +v -185.179703 -98.466240 -2.544017 +v -183.863602 -99.272179 -1.845385 +v -184.883438 -98.375206 -1.707118 +v -185.179703 -98.466240 -2.544017 +v -153.267090 -132.061356 -12.569209 +v -153.282867 -128.977966 -8.825084 +v -161.608154 -123.624969 -10.738367 +v -153.282867 -128.977966 -8.825084 +v -161.464722 -121.283943 -7.525141 +v -161.608154 -123.624969 -10.738367 +v -161.608154 -123.624969 -10.738367 +v -161.464722 -121.283943 -7.525141 +v -165.877075 -119.300491 -9.789935 +v -161.464722 -121.283943 -7.525141 +v -165.653656 -117.337944 -6.848155 +v -165.877075 -119.300491 -9.789935 +v -165.877075 -119.300491 -9.789935 +v -165.653656 -117.337944 -6.848155 +v -169.838684 -113.389442 -6.160251 +v -165.653656 -117.337944 -6.848155 +v -169.538422 -111.803551 -3.489741 +v -169.838684 -113.389442 -6.160251 +v -169.838684 -113.389442 -6.160251 +v -169.538422 -111.803551 -3.489741 +v -174.018707 -109.438034 -5.457331 +v -169.538422 -111.803551 -3.489741 +v -173.639374 -108.228836 -3.056697 +v -174.018707 -109.438034 -5.457331 +v -174.018707 -109.438034 -5.457331 +v -173.639374 -108.228836 -3.056697 +v -176.106476 -107.461113 -5.098391 +v -173.639374 -108.228836 -3.056697 +v -175.687759 -106.439827 -2.832102 +v -176.106476 -107.461113 -5.098391 +v -176.106476 -107.461113 -5.098391 +v -175.687759 -106.439827 -2.832102 +v -178.192520 -105.483383 -4.733088 +v -175.687759 -106.439827 -2.832102 +v -177.734512 -104.649643 -2.600542 +v -178.192520 -105.483383 -4.733088 +v -178.192520 -105.483383 -4.733088 +v -177.734512 -104.649643 -2.600542 +v -180.276688 -103.504845 -4.360018 +v -177.734512 -104.649643 -2.600542 +v -179.779495 -102.858238 -2.360415 +v -180.276688 -103.504845 -4.360018 +v -180.276688 -103.504845 -4.360018 +v -179.779495 -102.858238 -2.360415 +v -182.358749 -101.525620 -3.977412 +v -179.779495 -102.858238 -2.360415 +v -181.822556 -101.065681 -2.109622 +v -182.358749 -101.525620 -3.977412 +v -182.358749 -101.525620 -3.977412 +v -181.822556 -101.065681 -2.109622 +v -183.863602 -99.272179 -1.845385 +v -181.822556 -101.065681 -2.109622 +v -183.762741 -99.222572 -1.536342 +v -183.863602 -99.272179 -1.845385 +v -183.863602 -99.272179 -1.845385 +v -183.762741 -99.222572 -1.536342 +v -183.941238 -99.077583 -1.537196 +v -185.409439 -97.830566 -1.419741 +v -185.495804 -97.836243 -1.621287 +v -184.883438 -98.375206 -1.707118 +v -185.495804 -97.836243 -1.621287 +v -185.842484 -97.857956 -2.430239 +v -184.883438 -98.375206 -1.707118 +v -184.883438 -98.375206 -1.707118 +v -185.842484 -97.857956 -2.430239 +v -185.179703 -98.466240 -2.544017 +v -185.842484 -97.857956 -2.430239 +v -186.188431 -97.878090 -3.237422 +v -185.179703 -98.466240 -2.544017 +v -185.179703 -98.466240 -2.544017 +v -186.188431 -97.878090 -3.237422 +v -185.477737 -98.556076 -3.380305 +v -186.188431 -97.878090 -3.237422 +v -186.533585 -97.896790 -4.042803 +v -185.477737 -98.556076 -3.380305 +v -185.477737 -98.556076 -3.380305 +v -186.533585 -97.896790 -4.042803 +v -184.438614 -99.545944 -3.582926 +v -186.533585 -97.896790 -4.042803 +v -184.728500 -99.681274 -4.451052 +v -184.438614 -99.545944 -3.582926 +v -184.438614 -99.545944 -3.582926 +v -184.728500 -99.681274 -4.451052 +v -182.358749 -101.525620 -3.977412 +v -184.728500 -99.681274 -4.451052 +v -182.900345 -101.982162 -5.844294 +v -182.358749 -101.525620 -3.977412 +v -182.358749 -101.525620 -3.977412 +v -182.900345 -101.982162 -5.844294 +v -180.276688 -103.504845 -4.360018 +v -182.900345 -101.982162 -5.844294 +v -180.778671 -104.148621 -6.359210 +v -180.276688 -103.504845 -4.360018 +v -180.276688 -103.504845 -4.360018 +v -180.778671 -104.148621 -6.359210 +v -178.192520 -105.483383 -4.733088 +v -180.778671 -104.148621 -6.359210 +v -178.654861 -106.314751 -6.865526 +v -178.192520 -105.483383 -4.733088 +v -178.192520 -105.483383 -4.733088 +v -178.654861 -106.314751 -6.865526 +v -176.106476 -107.461113 -5.098391 +v -178.654861 -106.314751 -6.865526 +v -176.529083 -108.480400 -7.364787 +v -176.106476 -107.461113 -5.098391 +v -176.106476 -107.461113 -5.098391 +v -176.529083 -108.480400 -7.364787 +v -174.018707 -109.438034 -5.457331 +v -176.529083 -108.480400 -7.364787 +v -174.401550 -110.645523 -7.858195 +v -174.018707 -109.438034 -5.457331 +v -174.018707 -109.438034 -5.457331 +v -174.401550 -110.645523 -7.858195 +v -170.141876 -114.974083 -8.831119 +v -174.401550 -110.645523 -7.858195 +v -170.243683 -116.664734 -11.396892 +v -170.141876 -114.974083 -8.831119 +v -170.141876 -114.974083 -8.831119 +v -170.243683 -116.664734 -11.396892 +v -166.091156 -121.163300 -12.583697 +v 160.228638 -116.395905 -4.707498 +v 157.571091 -107.447922 -5.760202 +v 163.524033 -114.003532 -4.988954 +v 157.571091 -107.447922 -5.760202 +v 159.567749 -105.451286 -5.995095 +v 163.524033 -114.003532 -4.988954 +v 163.524033 -114.003532 -4.988954 +v 159.567749 -105.451286 -5.995095 +v 167.658310 -110.952873 -5.347849 +v -167.658234 -110.952843 -5.347819 +v -159.567642 -105.451256 -5.995069 +v -163.523956 -114.003502 -4.988925 +v -159.567642 -105.451256 -5.995069 +v -157.571014 -107.447891 -5.760174 +v -163.523956 -114.003502 -4.988925 +v -163.523956 -114.003502 -4.988925 +v -157.571014 -107.447891 -5.760174 +v -160.228577 -116.395874 -4.707469 +v -157.571014 -107.447891 -5.760174 +v -156.716522 -118.915443 -4.411045 +v -160.228577 -116.395874 -4.707469 +v 160.228638 -116.395905 -4.707498 +v 156.716568 -118.915474 -4.411072 +v 157.571091 -107.447922 -5.760202 +v 156.716568 -118.915474 -4.411072 +v 152.620651 -121.822601 -4.069061 +v 157.571091 -107.447922 -5.760202 +v 157.571091 -107.447922 -5.760202 +v 152.620651 -121.822601 -4.069061 +v -157.571014 -107.447891 -5.760174 +v 152.620651 -121.822601 -4.069061 +v -152.620575 -121.822571 -4.069034 +v -157.571014 -107.447891 -5.760174 +v -157.571014 -107.447891 -5.760174 +v -152.620575 -121.822571 -4.069034 +v -156.716522 -118.915443 -4.411045 +v -185.409439 -97.830566 -1.419741 +v -183.941238 -99.077583 -1.537196 +v -185.409424 115.052109 -1.419757 +v -183.941238 -99.077583 -1.537196 +v -180.995377 -99.075989 -1.772868 +v -185.409424 115.052109 -1.419757 +v -162.099808 -99.046623 -3.284512 +v -162.099792 115.052109 -3.284528 +v -169.582657 -99.065201 -2.685879 +v -162.099792 115.052109 -3.284528 +v -185.409424 115.052109 -1.419757 +v -169.582657 -99.065201 -2.685879 +v -169.582657 -99.065201 -2.685879 +v -185.409424 115.052109 -1.419757 +v -174.699203 -99.071297 -2.276561 +v -185.409424 115.052109 -1.419757 +v -180.995377 -99.075989 -1.772868 +v -174.699203 -99.071297 -2.276561 +v -184.999954 -96.992966 -12.173396 +v -184.999954 -96.992966 -6.970957 +v -184.726639 -97.289047 -7.058482 +v -184.726639 -97.289047 -7.058482 +v -183.199326 -98.943649 -7.544024 +v -184.999954 -96.992966 -12.173396 +v -183.199326 -98.943649 -7.544024 +v -181.155319 -101.157990 -8.185221 +v -184.999954 -96.992966 -12.173396 +v -184.999954 -96.992966 -12.173396 +v -181.155319 -101.157990 -8.185221 +v -179.112015 -103.371590 -8.817804 +v -175.019043 -107.805641 -10.064578 +v -172.967499 -110.028160 -10.681247 +v -184.999954 -96.992966 -12.173396 +v -179.112015 -103.371590 -8.817804 +v -177.341934 -105.289139 -9.359987 +v -184.999954 -96.992966 -12.173396 +v -177.341934 -105.289139 -9.359987 +v -177.068649 -105.585220 -9.443278 +v -184.999954 -96.992966 -12.173396 +v -184.999954 -96.992966 -12.173396 +v -177.068649 -105.585220 -9.443278 +v -175.019043 -107.805641 -10.064578 +v -172.967499 -110.028160 -10.681247 +v -168.858765 -114.479279 -11.903369 +v -184.999954 -96.992966 -12.173396 +v -168.858765 -114.479279 -11.903369 +v -168.492676 -114.875877 -12.011546 +v -184.999954 -96.992966 -12.173396 +v -184.999954 -96.992966 -12.173396 +v -168.492676 -114.875877 -12.011546 +v -153.999969 -130.576309 -20.784512 +v -168.492676 -114.875877 -12.011546 +v -164.736725 -118.944801 -13.115718 +v -153.999969 -130.576309 -20.784512 +v -153.999969 -130.576309 -20.784512 +v -164.736725 -118.944801 -13.115718 +v -160.604706 -123.421188 -14.320429 +v -151.810822 -132.947891 -17.578333 +v -151.810822 -132.947891 -20.784512 +v -152.510620 -132.189758 -16.657755 +v -151.810822 -132.947891 -20.784512 +v -153.999969 -130.576309 -20.784512 +v -152.510620 -132.189758 -16.657755 +v -152.510620 -132.189758 -16.657755 +v -153.999969 -130.576309 -20.784512 +v -155.410187 -129.048599 -15.823330 +v -153.999969 -130.576309 -20.784512 +v -160.604706 -123.421188 -14.320429 +v -155.410187 -129.048599 -15.823330 +v 154.000031 -130.576340 -20.784538 +v 154.000031 -134.262115 -20.784538 +v 151.810867 -132.947922 -20.784538 +v 154.000031 -134.262115 -20.784538 +v 152.905457 -135.447922 -20.784538 +v 151.810867 -132.947922 -20.784538 +v 151.810867 -132.947922 -20.784538 +v 152.905457 -135.447922 -20.784538 +v -151.810822 -132.947891 -20.784512 +v 152.905457 -135.447922 -20.784538 +v -152.905396 -135.447891 -20.784512 +v -151.810822 -132.947891 -20.784512 +v -151.810822 -132.947891 -20.784512 +v -152.905396 -135.447891 -20.784512 +v -153.999969 -130.576309 -20.784512 +v -152.905396 -135.447891 -20.784512 +v -153.999969 -134.262085 -20.784512 +v -153.999969 -130.576309 -20.784512 +v 151.810867 -132.947922 -17.578360 +v 151.810867 -132.947922 -20.784538 +v -151.810822 -132.947891 -17.578333 +v 151.810867 -132.947922 -20.784538 +v -151.810822 -132.947891 -20.784512 +v -151.810822 -132.947891 -17.578333 +v -174.905838 -104.679176 -4.768015 +v -174.137283 -105.347916 -4.829501 +v -174.398148 -106.079140 -6.386898 +v -156.716522 -118.915443 -4.411045 +v -152.620575 -121.822571 -4.069034 +v -152.591644 -124.382614 -7.177654 +v -155.410187 -129.048599 -15.823330 +v -160.604706 -123.421188 -14.320429 +v -160.504089 -121.540482 -11.748446 +v -152.536041 -129.628418 -13.547542 +v -152.510620 -132.189758 -16.657755 +v -155.410187 -129.048599 -15.823330 +v -155.410187 -129.048599 -15.823330 +v -160.504089 -121.540482 -11.748446 +v -152.536041 -129.628418 -13.547542 +v -160.504089 -121.540482 -11.748446 +v -160.399506 -119.531502 -9.003009 +v -152.536041 -129.628418 -13.547542 +v -152.536041 -129.628418 -13.547542 +v -160.399506 -119.531502 -9.003009 +v -152.563263 -127.005280 -10.362323 +v -167.658234 -110.952843 -5.347819 +v -163.523956 -114.003502 -4.988925 +v -164.243652 -113.995384 -5.765246 +v -163.523956 -114.003502 -4.988925 +v -160.228577 -116.395874 -4.707469 +v -164.243652 -113.995384 -5.765246 +v -156.716522 -118.915443 -4.411045 +v -152.591644 -124.382614 -7.177654 +v -160.228577 -116.395874 -4.707469 +v -152.591644 -124.382614 -7.177654 +v -160.298004 -117.521454 -6.258166 +v -160.228577 -116.395874 -4.707469 +v -160.228577 -116.395874 -4.707469 +v -160.298004 -117.521454 -6.258166 +v -164.243652 -113.995384 -5.765246 +v -160.298004 -117.521454 -6.258166 +v -164.409515 -115.694084 -8.285655 +v -164.243652 -113.995384 -5.765246 +v -164.243652 -113.995384 -5.765246 +v -164.409515 -115.694084 -8.285655 +v -167.658234 -110.952843 -5.347819 +v -164.409515 -115.694084 -8.285655 +v -168.412140 -111.852119 -7.548061 +v -167.658234 -110.952843 -5.347819 +v -167.658234 -110.952843 -5.347819 +v -168.412140 -111.852119 -7.548061 +v -168.184784 -110.499069 -5.305698 +v -168.412140 -111.852119 -7.548061 +v -172.405548 -108.004906 -6.782969 +v -168.184784 -110.499069 -5.305698 +v -168.184784 -110.499069 -5.305698 +v -172.405548 -108.004906 -6.782969 +v -172.143448 -107.078369 -4.989009 +v -174.905838 -104.679176 -4.768015 +v -174.398148 -106.079140 -6.386898 +v -176.130814 -103.610924 -4.670016 +v -182.333908 -98.362343 -4.661899 +v -182.193558 -98.264458 -4.184993 +v -180.355759 -100.293221 -5.120349 +v -182.193558 -98.264458 -4.184993 +v -181.138748 -99.203835 -4.269382 +v -180.355759 -100.293221 -5.120349 +v -182.792130 -98.673447 -6.197032 +v -184.841568 -96.908249 -6.441241 +v -183.913895 -96.816910 -4.276690 +v -184.999954 -96.992966 -6.970957 +v -184.999954 -96.922340 -6.810801 +v -184.726639 -97.289047 -7.058482 +v -184.999954 -96.922340 -6.810801 +v -184.841568 -96.908249 -6.441241 +v -184.726639 -97.289047 -7.058482 +v -184.726639 -97.289047 -7.058482 +v -184.841568 -96.908249 -6.441241 +v -183.199326 -98.943649 -7.544024 +v -184.841568 -96.908249 -6.441241 +v -182.792130 -98.673447 -6.197032 +v -183.199326 -98.943649 -7.544024 +v -182.792130 -98.673447 -6.197032 +v -180.782211 -100.756393 -6.760554 +v -183.199326 -98.943649 -7.544024 +v -183.199326 -98.943649 -7.544024 +v -180.782211 -100.756393 -6.760554 +v -181.155319 -101.157990 -8.185221 +v -180.782211 -100.756393 -6.760554 +v -178.768143 -102.839027 -7.305438 +v -181.155319 -101.157990 -8.185221 +v -181.155319 -101.157990 -8.185221 +v -178.768143 -102.839027 -7.305438 +v -179.112015 -103.371590 -8.817804 +v -179.112015 -103.371590 -8.817804 +v -178.768143 -102.839027 -7.305438 +v -177.341934 -105.289139 -9.359987 +v -178.768143 -102.839027 -7.305438 +v -176.750229 -104.920959 -7.835024 +v -177.341934 -105.289139 -9.359987 +v -177.341934 -105.289139 -9.359987 +v -176.750229 -104.920959 -7.835024 +v -177.068649 -105.585220 -9.443278 +v -168.492676 -114.875877 -12.011546 +v -168.858765 -114.479279 -11.903369 +v -168.646210 -113.238686 -9.845492 +v -168.858765 -114.479279 -11.903369 +v -172.967499 -110.028160 -10.681247 +v -168.646210 -113.238686 -9.845492 +v -168.646210 -113.238686 -9.845492 +v -172.967499 -110.028160 -10.681247 +v -172.704071 -109.081924 -8.858256 +v -160.604706 -123.421188 -14.320429 +v -164.736725 -118.944801 -13.115718 +v -160.504089 -121.540482 -11.748446 +v -164.736725 -118.944801 -13.115718 +v -164.409515 -115.694084 -8.285655 +v -160.504089 -121.540482 -11.748446 +v -160.504089 -121.540482 -11.748446 +v -164.409515 -115.694084 -8.285655 +v -160.399506 -119.531502 -9.003009 +v -164.409515 -115.694084 -8.285655 +v -160.298004 -117.521454 -6.258166 +v -160.399506 -119.531502 -9.003009 +v -160.399506 -119.531502 -9.003009 +v -160.298004 -117.521454 -6.258166 +v -152.563263 -127.005280 -10.362323 +v -160.298004 -117.521454 -6.258166 +v -152.591644 -124.382614 -7.177654 +v -152.563263 -127.005280 -10.362323 +v -175.019043 -107.805641 -10.064578 +v -177.068649 -105.585220 -9.443278 +v -174.728745 -107.001961 -8.351939 +v -177.068649 -105.585220 -9.443278 +v -176.750229 -104.920959 -7.835024 +v -174.728745 -107.001961 -8.351939 +v -174.728745 -107.001961 -8.351939 +v -176.750229 -104.920959 -7.835024 +v -176.387589 -104.151886 -5.979441 +v -176.750229 -104.920959 -7.835024 +v -178.768143 -102.839027 -7.305438 +v -176.387589 -104.151886 -5.979441 +v -176.387589 -104.151886 -5.979441 +v -178.768143 -102.839027 -7.305438 +v -178.373550 -102.223190 -5.558252 +v -178.768143 -102.839027 -7.305438 +v -180.782211 -100.756393 -6.760554 +v -178.373550 -102.223190 -5.558252 +v -178.373550 -102.223190 -5.558252 +v -180.782211 -100.756393 -6.760554 +v -180.355759 -100.293221 -5.120349 +v -180.782211 -100.756393 -6.760554 +v -182.792130 -98.673447 -6.197032 +v -180.355759 -100.293221 -5.120349 +v -180.355759 -100.293221 -5.120349 +v -182.792130 -98.673447 -6.197032 +v -182.333908 -98.362343 -4.661899 +v -182.792130 -98.673447 -6.197032 +v -183.913895 -96.816910 -4.276690 +v -182.333908 -98.362343 -4.661899 +v -182.333908 -98.362343 -4.661899 +v -183.913895 -96.816910 -4.276690 +v -182.193558 -98.264458 -4.184993 +v -183.913895 -96.816910 -4.276690 +v -183.818893 -96.806618 -4.054972 +v -182.193558 -98.264458 -4.184993 +v -181.138748 -99.203835 -4.269382 +v -180.156448 -100.074562 -4.347964 +v -180.355759 -100.293221 -5.120349 +v -180.156448 -100.074562 -4.347964 +v -178.135147 -101.855827 -4.509668 +v -180.355759 -100.293221 -5.120349 +v -180.355759 -100.293221 -5.120349 +v -178.135147 -101.855827 -4.509668 +v -178.373550 -102.223190 -5.558252 +v -178.135147 -101.855827 -4.509668 +v -176.130814 -103.610924 -4.670016 +v -178.373550 -102.223190 -5.558252 +v -178.373550 -102.223190 -5.558252 +v -176.130814 -103.610924 -4.670016 +v -176.387589 -104.151886 -5.979441 +v -176.130814 -103.610924 -4.670016 +v -174.398148 -106.079140 -6.386898 +v -176.387589 -104.151886 -5.979441 +v -176.387589 -104.151886 -5.979441 +v -174.398148 -106.079140 -6.386898 +v -174.728745 -107.001961 -8.351939 +v -174.398148 -106.079140 -6.386898 +v -172.704071 -109.081924 -8.858256 +v -174.728745 -107.001961 -8.351939 +v -174.728745 -107.001961 -8.351939 +v -172.704071 -109.081924 -8.858256 +v -175.019043 -107.805641 -10.064578 +v -172.704071 -109.081924 -8.858256 +v -172.967499 -110.028160 -10.681247 +v -175.019043 -107.805641 -10.064578 +v -164.736725 -118.944801 -13.115718 +v -168.492676 -114.875877 -12.011546 +v -164.409515 -115.694084 -8.285655 +v -168.492676 -114.875877 -12.011546 +v -168.646210 -113.238686 -9.845492 +v -164.409515 -115.694084 -8.285655 +v -164.409515 -115.694084 -8.285655 +v -168.646210 -113.238686 -9.845492 +v -168.412140 -111.852119 -7.548061 +v -168.646210 -113.238686 -9.845492 +v -172.704071 -109.081924 -8.858256 +v -168.412140 -111.852119 -7.548061 +v -168.412140 -111.852119 -7.548061 +v -172.704071 -109.081924 -8.858256 +v -172.405548 -108.004906 -6.782969 +v -172.704071 -109.081924 -8.858256 +v -174.398148 -106.079140 -6.386898 +v -172.405548 -108.004906 -6.782969 +v -172.405548 -108.004906 -6.782969 +v -174.398148 -106.079140 -6.386898 +v -172.143448 -107.078369 -4.989009 +v -174.398148 -106.079140 -6.386898 +v -174.137283 -105.347916 -4.829501 +v -172.143448 -107.078369 -4.989009 +v -167.658234 -110.952843 -5.347819 +v -168.184784 -110.499069 -5.305698 +v -159.567642 -105.451256 -5.995069 +v -168.184784 -110.499069 -5.305698 +v -162.499954 -102.518959 -5.760487 +v -159.567642 -105.451256 -5.995069 +v -174.905838 -104.679176 -4.768015 +v -162.499939 115.052109 -5.760503 +v -174.137283 -105.347916 -4.829501 +v -162.499939 115.052109 -5.760503 +v -162.499954 -102.518959 -5.760487 +v -174.137283 -105.347916 -4.829501 +v -174.137283 -105.347916 -4.829501 +v -162.499954 -102.518959 -5.760487 +v -172.143448 -107.078369 -4.989009 +v -162.499954 -102.518959 -5.760487 +v -168.184784 -110.499069 -5.305698 +v -172.143448 -107.078369 -4.989009 +v -174.905838 -104.679176 -4.768015 +v -176.130814 -103.610924 -4.670016 +v -162.499939 115.052109 -5.760503 +v -176.130814 -103.610924 -4.670016 +v -178.135147 -101.855827 -4.509668 +v -162.499939 115.052109 -5.760503 +v -162.499939 115.052109 -5.760503 +v -178.135147 -101.855827 -4.509668 +v -180.156448 -100.074562 -4.347964 +v -183.818893 -96.806618 -4.054972 +v -183.818878 115.052109 -4.054988 +v -182.193558 -98.264458 -4.184993 +v -183.818878 115.052109 -4.054988 +v -162.499939 115.052109 -5.760503 +v -182.193558 -98.264458 -4.184993 +v -182.193558 -98.264458 -4.184993 +v -162.499939 115.052109 -5.760503 +v -181.138748 -99.203835 -4.269382 +v -162.499939 115.052109 -5.760503 +v -180.156448 -100.074562 -4.347964 +v -181.138748 -99.203835 -4.269382 +v 153.316559 -122.885269 -1.426796 +v 154.111572 -122.329712 -1.492157 +v 154.122803 -112.603661 -2.636399 +v -154.122742 -112.603630 -2.636372 +v -154.111511 -122.329681 -1.492130 +v -153.316498 -122.885239 -1.426769 +v -153.316498 -122.885239 -1.426769 +v 153.316559 -122.885269 -1.426796 +v -154.122742 -112.603630 -2.636372 +v 153.316559 -122.885269 -1.426796 +v 154.122803 -112.603661 -2.636399 +v -154.122742 -112.603630 -2.636372 +v -154.122742 -112.603630 -2.636372 +v 154.122803 -112.603661 -2.636399 +v -154.148178 -107.094444 -3.284512 +v 154.122803 -112.603661 -2.636399 +v 154.148270 -107.094475 -3.284539 +v -154.148178 -107.094444 -3.284512 +v -153.999969 -130.576309 -20.784512 +v -153.999969 -134.262085 -20.784512 +v -184.999954 -96.992966 -12.173396 +v -153.999969 -134.262085 -20.784512 +v -187.499954 -97.970436 -11.478952 +v -184.999954 -96.992966 -12.173396 +v -184.999954 -96.992966 -12.173396 +v -187.499954 -97.970436 -11.478952 +v -184.999939 115.052109 -12.173411 +v -187.499954 -97.970436 -11.478952 +v -187.499939 115.052109 -11.478969 +v -184.999939 115.052109 -12.173411 +v 185.000061 115.052078 -12.173444 +v 187.500061 115.052078 -11.479001 +v 185.000046 -96.992996 -12.173429 +v 187.500061 115.052078 -11.479001 +v 187.500046 -97.970467 -11.478985 +v 185.000046 -96.992996 -12.173429 +v 185.000046 -96.992996 -12.173429 +v 187.500046 -97.970467 -11.478985 +v 154.000031 -130.576340 -20.784538 +v 187.500046 -97.970467 -11.478985 +v 154.000031 -134.262115 -20.784538 +v 154.000031 -130.576340 -20.784538 +v -184.999954 -96.992966 -12.173396 +v -184.999939 115.052109 -12.173411 +v -184.999954 -96.992966 -6.970957 +v -184.999939 115.052109 -12.173411 +v -184.999939 115.052109 -6.810817 +v -184.999954 -96.992966 -6.970957 +v -184.999954 -96.992966 -6.970957 +v -184.999939 115.052109 -6.810817 +v -184.999954 -96.922340 -6.810801 +v 183.818985 -96.806648 -4.055005 +v 183.819000 115.052078 -4.055021 +v 183.913986 -96.816940 -4.276723 +v 183.819000 115.052078 -4.055021 +v 185.000061 115.052078 -6.810850 +v 183.913986 -96.816940 -4.276723 +v 183.913986 -96.816940 -4.276723 +v 185.000061 115.052078 -6.810850 +v 184.841660 -96.908279 -6.441273 +v 185.000061 115.052078 -6.810850 +v 185.000046 -96.922371 -6.810834 +v 184.841660 -96.908279 -6.441273 +v -103.356987 -106.447899 -3.284516 +v -154.783401 -106.447891 -3.284512 +v -154.148178 -107.094444 -3.284512 +v 154.148270 -107.094475 -3.284539 +v 154.783508 -106.447922 -3.284539 +v 103.357063 -106.447914 -3.284535 +v 103.357063 -106.447914 -3.284535 +v 51.678551 -106.447914 -3.284530 +v 154.148270 -107.094475 -3.284539 +v 51.678551 -106.447914 -3.284530 +v 0.000038 -106.447906 -3.284526 +v 154.148270 -107.094475 -3.284539 +v 154.148270 -107.094475 -3.284539 +v 0.000038 -106.447906 -3.284526 +v -154.148178 -107.094444 -3.284512 +v 0.000038 -106.447906 -3.284526 +v -51.678474 -106.447899 -3.284521 +v -154.148178 -107.094444 -3.284512 +v -154.148178 -107.094444 -3.284512 +v -51.678474 -106.447899 -3.284521 +v -103.356987 -106.447899 -3.284516 +v -158.999954 -103.947891 -6.784513 +v 159.000046 -103.947922 -6.784539 +v 157.571091 -107.447922 -6.784539 +v 157.571091 -107.447922 -6.784539 +v -157.571014 -107.447891 -6.784512 +v -158.999954 -103.947891 -6.784513 +v -157.571014 -107.447891 -6.784512 +v -162.499954 -102.518959 -6.784512 +v -158.999954 -103.947891 -6.784513 +v -158.999954 -103.947891 -6.784513 +v -162.499954 -102.518959 -6.784512 +v -158.999939 113.052109 -6.784529 +v -162.499954 -102.518959 -6.784512 +v -162.499939 115.052109 -6.784528 +v -158.999939 113.052109 -6.784529 +v -158.999939 113.052109 -6.784529 +v -162.499939 115.052109 -6.784528 +v 159.000061 113.052078 -6.784555 +v -162.499939 115.052109 -6.784528 +v 162.500061 115.052078 -6.784557 +v 159.000061 113.052078 -6.784555 +v 159.000061 113.052078 -6.784555 +v 162.500061 115.052078 -6.784557 +v 159.000046 -103.947922 -6.784539 +v 162.500061 115.052078 -6.784557 +v 162.500046 -102.518990 -6.784540 +v 159.000046 -103.947922 -6.784539 +v 159.000046 -103.947922 -6.784539 +v 162.500046 -102.518990 -6.784540 +v 157.571091 -107.447922 -6.784539 +v 162.500061 115.052078 -6.784557 +v -162.499939 115.052109 -6.784528 +v 162.500061 115.052078 -5.760532 +v -162.499939 115.052109 -6.784528 +v -162.499939 115.052109 -5.760503 +v 162.500061 115.052078 -5.760532 +v 187.500061 115.052078 -11.479001 +v 185.000061 115.052078 -12.173444 +v 187.500061 115.052078 -6.297704 +v 185.000061 115.052078 -12.173444 +v 185.000061 115.052078 -6.810850 +v 187.500061 115.052078 -6.297704 +v 187.500061 115.052078 -6.297704 +v 185.000061 115.052078 -6.810850 +v 185.409531 115.052078 -1.419790 +v 185.000061 115.052078 -6.810850 +v 183.819000 115.052078 -4.055021 +v 185.409531 115.052078 -1.419790 +v 185.409531 115.052078 -1.419790 +v 183.819000 115.052078 -4.055021 +v 162.099899 115.052078 -3.284557 +v 183.819000 115.052078 -4.055021 +v 162.500061 115.052078 -5.760532 +v 162.099899 115.052078 -3.284557 +v 162.099899 115.052078 -3.284557 +v 162.500061 115.052078 -5.760532 +v 161.500061 115.052078 -3.284557 +v -184.999939 115.052109 -12.173411 +v -187.499939 115.052109 -11.478969 +v -184.999939 115.052109 -6.810817 +v -187.499939 115.052109 -11.478969 +v -187.499939 115.052109 -6.297672 +v -184.999939 115.052109 -6.810817 +v -184.999939 115.052109 -6.810817 +v -187.499939 115.052109 -6.297672 +v -183.818878 115.052109 -4.054988 +v -187.499939 115.052109 -6.297672 +v -185.409424 115.052109 -1.419757 +v -183.818878 115.052109 -4.054988 +v -183.818878 115.052109 -4.054988 +v -185.409424 115.052109 -1.419757 +v -162.499939 115.052109 -5.760503 +v -185.409424 115.052109 -1.419757 +v -162.099792 115.052109 -3.284528 +v -162.499939 115.052109 -5.760503 +v 161.500061 115.052078 -3.284557 +v 162.500061 115.052078 -5.760532 +v 161.500061 115.052078 -4.284557 +v 162.500061 115.052078 -5.760532 +v -162.499939 115.052109 -5.760503 +v 161.500061 115.052078 -4.284557 +v 161.500061 115.052078 -4.284557 +v -162.499939 115.052109 -5.760503 +v -161.499939 115.052109 -4.284528 +v -162.499939 115.052109 -5.760503 +v -162.099792 115.052109 -3.284528 +v -161.499939 115.052109 -4.284528 +v -161.499939 115.052109 -4.284528 +v -162.099792 115.052109 -3.284528 +v -161.499939 115.052109 -3.284528 +v 154.783508 -106.447922 -3.284539 +v 155.035583 -106.447922 -3.255738 +v 155.035583 -106.447922 -4.284539 +v 154.783508 -106.447922 -3.284539 +v 155.035583 -106.447922 -4.284539 +v 103.357063 -106.447914 -3.284535 +v 155.035583 -106.447922 -4.284539 +v 103.357063 -106.447914 -4.284535 +v 103.357063 -106.447914 -3.284535 +v 103.357063 -106.447914 -4.284535 +v 51.678551 -106.447914 -4.284530 +v 103.357063 -106.447914 -3.284535 +v 103.357063 -106.447914 -3.284535 +v 51.678551 -106.447914 -4.284530 +v 51.678551 -106.447914 -3.284530 +v 51.678551 -106.447914 -4.284530 +v 0.000038 -106.447906 -4.284526 +v 51.678551 -106.447914 -3.284530 +v 51.678551 -106.447914 -3.284530 +v 0.000038 -106.447906 -4.284526 +v 0.000038 -106.447906 -3.284526 +v 0.000038 -106.447906 -4.284526 +v -51.678474 -106.447899 -4.284522 +v 0.000038 -106.447906 -3.284526 +v 0.000038 -106.447906 -3.284526 +v -51.678474 -106.447899 -4.284522 +v -51.678474 -106.447899 -3.284521 +v -51.678474 -106.447899 -4.284522 +v -103.356987 -106.447899 -4.284516 +v -51.678474 -106.447899 -3.284521 +v -51.678474 -106.447899 -3.284521 +v -103.356987 -106.447899 -4.284516 +v -103.356987 -106.447899 -3.284516 +v -103.356987 -106.447899 -3.284516 +v -103.356987 -106.447899 -4.284516 +v -154.783401 -106.447891 -3.284512 +v -103.356987 -106.447899 -4.284516 +v -155.035477 -106.447891 -4.284513 +v -154.783401 -106.447891 -3.284512 +v -154.783401 -106.447891 -3.284512 +v -155.035477 -106.447891 -4.284513 +v -155.035477 -106.447891 -3.255711 +v -158.999954 -102.483429 -3.256306 +v -158.999954 -103.947891 -3.115780 +v -158.999954 -102.483429 -4.284513 +v -158.999954 -103.947891 -3.115780 +v -158.999954 -103.947891 -6.784513 +v -158.999954 -102.483429 -4.284513 +v -158.999954 -102.483429 -4.284513 +v -158.999954 -103.947891 -6.784513 +v -158.999939 113.052109 -4.284529 +v -158.999954 -103.947891 -6.784513 +v -158.999939 113.052109 -6.784529 +v -158.999939 113.052109 -4.284529 +v 157.535583 -103.947922 -3.255921 +v 159.000046 -103.947922 -3.115808 +v 157.535583 -103.947922 -4.284539 +v 159.000046 -103.947922 -3.115808 +v 159.000046 -103.947922 -6.784539 +v 157.535583 -103.947922 -4.284539 +v 157.535583 -103.947922 -4.284539 +v 159.000046 -103.947922 -6.784539 +v -157.535477 -103.947891 -4.284513 +v 159.000046 -103.947922 -6.784539 +v -158.999954 -103.947891 -6.784513 +v -157.535477 -103.947891 -4.284513 +v -157.535477 -103.947891 -4.284513 +v -158.999954 -103.947891 -6.784513 +v -157.535477 -103.947891 -3.255894 +v -158.999954 -103.947891 -6.784513 +v -158.999954 -103.947891 -3.115780 +v -157.535477 -103.947891 -3.255894 +v -187.499939 115.052109 -6.297672 +v -187.499954 -97.942810 -6.297656 +v -187.069168 -97.923363 -5.292468 +v -187.069168 -97.923363 -5.292468 +v -186.877975 -97.914192 -4.846377 +v -187.499939 115.052109 -6.297672 +v -186.877975 -97.914192 -4.846377 +v -186.533585 -97.896790 -4.042803 +v -187.499939 115.052109 -6.297672 +v -187.499939 115.052109 -6.297672 +v -186.533585 -97.896790 -4.042803 +v -186.188431 -97.878090 -3.237422 +v -185.409439 -97.830566 -1.419741 +v -185.409424 115.052109 -1.419757 +v -185.495804 -97.836243 -1.621287 +v -185.409424 115.052109 -1.419757 +v -187.499939 115.052109 -6.297672 +v -185.495804 -97.836243 -1.621287 +v -185.495804 -97.836243 -1.621287 +v -187.499939 115.052109 -6.297672 +v -185.842484 -97.857956 -2.430239 +v -187.499939 115.052109 -6.297672 +v -186.188431 -97.878090 -3.237422 +v -185.842484 -97.857956 -2.430239 +v -184.841568 -96.908249 -6.441241 +v -184.999954 -96.922340 -6.810801 +v -184.999939 115.052109 -6.810817 +v -184.841568 -96.908249 -6.441241 +v -184.999939 115.052109 -6.810817 +v -183.913895 -96.816910 -4.276690 +v -184.999939 115.052109 -6.810817 +v -183.818878 115.052109 -4.054988 +v -183.913895 -96.816910 -4.276690 +v -183.913895 -96.816910 -4.276690 +v -183.818878 115.052109 -4.054988 +v -183.818893 -96.806618 -4.054972 +v -162.499954 -102.518959 -5.760487 +v -162.499954 -102.518959 -6.784512 +v -159.567642 -105.451256 -5.995069 +v -162.499954 -102.518959 -6.784512 +v -157.571014 -107.447891 -6.784512 +v -159.567642 -105.451256 -5.995069 +v -159.567642 -105.451256 -5.995069 +v -157.571014 -107.447891 -6.784512 +v -157.571014 -107.447891 -5.760174 +v -152.905396 -135.447891 -16.681421 +v 152.905457 -135.447922 -16.681448 +v -153.252411 -135.071945 -16.224909 +v 152.905457 -135.447922 -16.681448 +v 153.252487 -135.071976 -16.224936 +v -153.252411 -135.071945 -16.224909 +v -153.252411 -135.071945 -16.224909 +v 153.252487 -135.071976 -16.224936 +v -153.267090 -132.061356 -12.569209 +v 153.252487 -135.071976 -16.224936 +v 153.267151 -132.061386 -12.569236 +v -153.267090 -132.061356 -12.569209 +v -153.267090 -132.061356 -12.569209 +v 153.267151 -132.061386 -12.569236 +v -153.282867 -128.977966 -8.825084 +v 153.267151 -132.061386 -12.569236 +v 153.282928 -128.977997 -8.825110 +v -153.282867 -128.977966 -8.825084 +v -153.282867 -128.977966 -8.825084 +v 153.282928 -128.977997 -8.825110 +v -153.299469 -125.894882 -5.081348 +v 153.282928 -128.977997 -8.825110 +v 153.299515 -125.894913 -5.081375 +v -153.299469 -125.894882 -5.081348 +v -153.299469 -125.894882 -5.081348 +v 153.299515 -125.894913 -5.081375 +v -153.316498 -122.885239 -1.426769 +v 153.299515 -125.894913 -5.081375 +v 153.316559 -122.885269 -1.426796 +v -153.316498 -122.885239 -1.426769 +v 175.019104 -107.805672 -10.064609 +v 174.728836 -107.001991 -8.351970 +v 176.750320 -104.920990 -7.835055 +v 155.410233 -129.048630 -15.823356 +v 152.510681 -132.189789 -16.657782 +v 152.536118 -129.628448 -13.547568 +v 184.841660 -96.908279 -6.441273 +v 185.000046 -96.922371 -6.810834 +v 185.000046 -96.992996 -6.970990 +v 182.334000 -98.362373 -4.661930 +v 183.913986 -96.816940 -4.276723 +v 184.841660 -96.908279 -6.441273 +v 183.818985 -96.806648 -4.055005 +v 183.913986 -96.816940 -4.276723 +v 182.193665 -98.264488 -4.185024 +v 183.913986 -96.816940 -4.276723 +v 182.334000 -98.362373 -4.661930 +v 182.193665 -98.264488 -4.185024 +v 182.193665 -98.264488 -4.185024 +v 182.334000 -98.362373 -4.661930 +v 181.138855 -99.203865 -4.269413 +v 182.334000 -98.362373 -4.661930 +v 180.355850 -100.293251 -5.120381 +v 181.138855 -99.203865 -4.269413 +v 181.138855 -99.203865 -4.269413 +v 180.355850 -100.293251 -5.120381 +v 180.156525 -100.074593 -4.347996 +v 180.355850 -100.293251 -5.120381 +v 178.373657 -102.223221 -5.558284 +v 180.156525 -100.074593 -4.347996 +v 180.156525 -100.074593 -4.347996 +v 178.373657 -102.223221 -5.558284 +v 178.135254 -101.855858 -4.509700 +v 167.658310 -110.952873 -5.347849 +v 168.184830 -110.499100 -5.305727 +v 168.412186 -111.852150 -7.548090 +v 168.184830 -110.499100 -5.305727 +v 172.143524 -107.078400 -4.989039 +v 168.412186 -111.852150 -7.548090 +v 168.412186 -111.852150 -7.548090 +v 172.143524 -107.078400 -4.989039 +v 172.405609 -108.004936 -6.783000 +v 172.143524 -107.078400 -4.989039 +v 174.137375 -105.347946 -4.829531 +v 172.405609 -108.004936 -6.783000 +v 172.405609 -108.004936 -6.783000 +v 174.137375 -105.347946 -4.829531 +v 174.398224 -106.079170 -6.386928 +v 174.137375 -105.347946 -4.829531 +v 174.905914 -104.679207 -4.768046 +v 174.398224 -106.079170 -6.386928 +v 174.398224 -106.079170 -6.386928 +v 174.905914 -104.679207 -4.768046 +v 176.387680 -104.151917 -5.979472 +v 174.905914 -104.679207 -4.768046 +v 176.130905 -103.610954 -4.670046 +v 176.387680 -104.151917 -5.979472 +v 176.387680 -104.151917 -5.979472 +v 176.130905 -103.610954 -4.670046 +v 178.135254 -101.855858 -4.509700 +v 152.591690 -124.382645 -7.177681 +v 152.620651 -121.822601 -4.069061 +v 156.716568 -118.915474 -4.411072 +v 156.716568 -118.915474 -4.411072 +v 160.298065 -117.521484 -6.258195 +v 152.591690 -124.382645 -7.177681 +v 160.298065 -117.521484 -6.258195 +v 160.399551 -119.531532 -9.003037 +v 152.591690 -124.382645 -7.177681 +v 152.591690 -124.382645 -7.177681 +v 160.399551 -119.531532 -9.003037 +v 152.563309 -127.005310 -10.362350 +v 152.536118 -129.628448 -13.547568 +v 152.563309 -127.005310 -10.362350 +v 160.504150 -121.540512 -11.748475 +v 152.563309 -127.005310 -10.362350 +v 160.399551 -119.531532 -9.003037 +v 160.504150 -121.540512 -11.748475 +v 160.504150 -121.540512 -11.748475 +v 160.399551 -119.531532 -9.003037 +v 164.409561 -115.694115 -8.285684 +v 160.399551 -119.531532 -9.003037 +v 160.298065 -117.521484 -6.258195 +v 164.409561 -115.694115 -8.285684 +v 164.409561 -115.694115 -8.285684 +v 160.298065 -117.521484 -6.258195 +v 164.243713 -113.995415 -5.765275 +v 155.410233 -129.048630 -15.823356 +v 152.536118 -129.628448 -13.547568 +v 160.604767 -123.421219 -14.320457 +v 152.536118 -129.628448 -13.547568 +v 160.504150 -121.540512 -11.748475 +v 160.604767 -123.421219 -14.320457 +v 160.604767 -123.421219 -14.320457 +v 160.504150 -121.540512 -11.748475 +v 164.736801 -118.944832 -13.115746 +v 160.504150 -121.540512 -11.748475 +v 164.409561 -115.694115 -8.285684 +v 164.736801 -118.944832 -13.115746 +v 164.736801 -118.944832 -13.115746 +v 164.409561 -115.694115 -8.285684 +v 168.492737 -114.875908 -12.011575 +v 164.409561 -115.694115 -8.285684 +v 168.646286 -113.238716 -9.845521 +v 168.492737 -114.875908 -12.011575 +v 168.492737 -114.875908 -12.011575 +v 168.646286 -113.238716 -9.845521 +v 168.858826 -114.479309 -11.903398 +v 168.646286 -113.238716 -9.845521 +v 172.704117 -109.081955 -8.858286 +v 168.858826 -114.479309 -11.903398 +v 168.858826 -114.479309 -11.903398 +v 172.704117 -109.081955 -8.858286 +v 172.967560 -110.028191 -10.681277 +v 184.726746 -97.289078 -7.058514 +v 183.199417 -98.943680 -7.544057 +v 182.792206 -98.673477 -6.197064 +v 183.199417 -98.943680 -7.544057 +v 181.155411 -101.158020 -8.185253 +v 182.792206 -98.673477 -6.197064 +v 182.792206 -98.673477 -6.197064 +v 181.155411 -101.158020 -8.185253 +v 180.782303 -100.756424 -6.760586 +v 181.155411 -101.158020 -8.185253 +v 179.112091 -103.371620 -8.817837 +v 180.782303 -100.756424 -6.760586 +v 180.782303 -100.756424 -6.760586 +v 179.112091 -103.371620 -8.817837 +v 178.768250 -102.839058 -7.305470 +v 179.112091 -103.371620 -8.817837 +v 177.342041 -105.289169 -9.360020 +v 178.768250 -102.839058 -7.305470 +v 178.768250 -102.839058 -7.305470 +v 177.342041 -105.289169 -9.360020 +v 176.750320 -104.920990 -7.835055 +v 177.342041 -105.289169 -9.360020 +v 177.068741 -105.585251 -9.443309 +v 176.750320 -104.920990 -7.835055 +v 176.750320 -104.920990 -7.835055 +v 177.068741 -105.585251 -9.443309 +v 175.019104 -107.805672 -10.064609 +v 185.000046 -96.992996 -6.970990 +v 184.726746 -97.289078 -7.058514 +v 184.841660 -96.908279 -6.441273 +v 184.726746 -97.289078 -7.058514 +v 182.792206 -98.673477 -6.197064 +v 184.841660 -96.908279 -6.441273 +v 184.841660 -96.908279 -6.441273 +v 182.792206 -98.673477 -6.197064 +v 182.334000 -98.362373 -4.661930 +v 182.792206 -98.673477 -6.197064 +v 180.782303 -100.756424 -6.760586 +v 182.334000 -98.362373 -4.661930 +v 182.334000 -98.362373 -4.661930 +v 180.782303 -100.756424 -6.760586 +v 180.355850 -100.293251 -5.120381 +v 180.782303 -100.756424 -6.760586 +v 178.768250 -102.839058 -7.305470 +v 180.355850 -100.293251 -5.120381 +v 180.355850 -100.293251 -5.120381 +v 178.768250 -102.839058 -7.305470 +v 178.373657 -102.223221 -5.558284 +v 178.768250 -102.839058 -7.305470 +v 176.750320 -104.920990 -7.835055 +v 178.373657 -102.223221 -5.558284 +v 178.135254 -101.855858 -4.509700 +v 178.373657 -102.223221 -5.558284 +v 176.387680 -104.151917 -5.979472 +v 178.373657 -102.223221 -5.558284 +v 176.750320 -104.920990 -7.835055 +v 176.387680 -104.151917 -5.979472 +v 176.387680 -104.151917 -5.979472 +v 176.750320 -104.920990 -7.835055 +v 174.398224 -106.079170 -6.386928 +v 176.750320 -104.920990 -7.835055 +v 174.728836 -107.001991 -8.351970 +v 174.398224 -106.079170 -6.386928 +v 174.398224 -106.079170 -6.386928 +v 174.728836 -107.001991 -8.351970 +v 172.405609 -108.004936 -6.783000 +v 175.019104 -107.805672 -10.064609 +v 172.967560 -110.028191 -10.681277 +v 174.728836 -107.001991 -8.351970 +v 172.967560 -110.028191 -10.681277 +v 172.704117 -109.081955 -8.858286 +v 174.728836 -107.001991 -8.351970 +v 174.728836 -107.001991 -8.351970 +v 172.704117 -109.081955 -8.858286 +v 172.405609 -108.004936 -6.783000 +v 172.704117 -109.081955 -8.858286 +v 168.646286 -113.238716 -9.845521 +v 172.405609 -108.004936 -6.783000 +v 172.405609 -108.004936 -6.783000 +v 168.646286 -113.238716 -9.845521 +v 168.412186 -111.852150 -7.548090 +v 168.646286 -113.238716 -9.845521 +v 164.409561 -115.694115 -8.285684 +v 168.412186 -111.852150 -7.548090 +v 168.412186 -111.852150 -7.548090 +v 164.409561 -115.694115 -8.285684 +v 167.658310 -110.952873 -5.347849 +v 164.409561 -115.694115 -8.285684 +v 164.243713 -113.995415 -5.765275 +v 167.658310 -110.952873 -5.347849 +v 167.658310 -110.952873 -5.347849 +v 164.243713 -113.995415 -5.765275 +v 163.524033 -114.003532 -4.988954 +v 164.243713 -113.995415 -5.765275 +v 160.298065 -117.521484 -6.258195 +v 163.524033 -114.003532 -4.988954 +v 163.524033 -114.003532 -4.988954 +v 160.298065 -117.521484 -6.258195 +v 160.228638 -116.395905 -4.707498 +v 160.298065 -117.521484 -6.258195 +v 156.716568 -118.915474 -4.411072 +v 160.228638 -116.395905 -4.707498 +v -158.999939 113.052109 -6.784529 +v 159.000061 113.052078 -6.784555 +v -158.999939 113.052109 -4.284529 +v 159.000061 113.052078 -6.784555 +v 159.000061 113.052078 -4.284555 +v -158.999939 113.052109 -4.284529 +v -152.620575 -121.822571 -4.069034 +v 152.620651 -121.822601 -4.069061 +v -152.591644 -124.382614 -7.177654 +v 152.620651 -121.822601 -4.069061 +v 152.591690 -124.382645 -7.177681 +v -152.591644 -124.382614 -7.177654 +v -152.591644 -124.382614 -7.177654 +v 152.591690 -124.382645 -7.177681 +v -152.563263 -127.005280 -10.362323 +v 152.591690 -124.382645 -7.177681 +v 152.563309 -127.005310 -10.362350 +v -152.563263 -127.005280 -10.362323 +v -152.563263 -127.005280 -10.362323 +v 152.563309 -127.005310 -10.362350 +v -152.536041 -129.628418 -13.547542 +v 152.510681 -132.189789 -16.657782 +v 151.810867 -132.947922 -17.578360 +v -151.810822 -132.947891 -17.578333 +v 152.563309 -127.005310 -10.362350 +v 152.536118 -129.628448 -13.547568 +v -152.536041 -129.628418 -13.547542 +v 152.536118 -129.628448 -13.547568 +v 152.510681 -132.189789 -16.657782 +v -152.536041 -129.628418 -13.547542 +v -152.536041 -129.628418 -13.547542 +v 152.510681 -132.189789 -16.657782 +v -152.510620 -132.189758 -16.657755 +v 152.510681 -132.189789 -16.657782 +v -151.810822 -132.947891 -17.578333 +v -152.510620 -132.189758 -16.657755 +v -161.499954 -99.983421 -3.257260 +v -158.999954 -102.483429 -3.256306 +v -161.499954 -99.983421 -4.284512 +v -158.999954 -102.483429 -3.256306 +v -158.999954 -102.483429 -4.284513 +v -161.499954 -99.983421 -4.284512 +v 181.155411 -101.158020 -8.185253 +v 183.199417 -98.943680 -7.544057 +v 185.000046 -96.992996 -12.173429 +v 183.199417 -98.943680 -7.544057 +v 184.726746 -97.289078 -7.058514 +v 185.000046 -96.992996 -12.173429 +v 185.000046 -96.992996 -12.173429 +v 184.726746 -97.289078 -7.058514 +v 185.000046 -96.992996 -6.970990 +v 155.410233 -129.048630 -15.823356 +v 160.604767 -123.421219 -14.320457 +v 154.000031 -130.576340 -20.784538 +v 172.967560 -110.028191 -10.681277 +v 175.019104 -107.805672 -10.064609 +v 185.000046 -96.992996 -12.173429 +v 175.019104 -107.805672 -10.064609 +v 177.068741 -105.585251 -9.443309 +v 185.000046 -96.992996 -12.173429 +v 177.068741 -105.585251 -9.443309 +v 177.342041 -105.289169 -9.360020 +v 185.000046 -96.992996 -12.173429 +v 177.342041 -105.289169 -9.360020 +v 179.112091 -103.371620 -8.817837 +v 185.000046 -96.992996 -12.173429 +v 185.000046 -96.992996 -12.173429 +v 179.112091 -103.371620 -8.817837 +v 181.155411 -101.158020 -8.185253 +v 160.604767 -123.421219 -14.320457 +v 164.736801 -118.944832 -13.115746 +v 154.000031 -130.576340 -20.784538 +v 164.736801 -118.944832 -13.115746 +v 168.492737 -114.875908 -12.011575 +v 154.000031 -130.576340 -20.784538 +v 154.000031 -130.576340 -20.784538 +v 168.492737 -114.875908 -12.011575 +v 185.000046 -96.992996 -12.173429 +v 168.492737 -114.875908 -12.011575 +v 168.858826 -114.479309 -11.903398 +v 185.000046 -96.992996 -12.173429 +v 185.000046 -96.992996 -12.173429 +v 168.858826 -114.479309 -11.903398 +v 172.967560 -110.028191 -10.681277 +v 151.810867 -132.947922 -20.784538 +v 151.810867 -132.947922 -17.578360 +v 154.000031 -130.576340 -20.784538 +v 151.810867 -132.947922 -17.578360 +v 152.510681 -132.189789 -16.657782 +v 154.000031 -130.576340 -20.784538 +v 154.000031 -130.576340 -20.784538 +v 152.510681 -132.189789 -16.657782 +v 155.410233 -129.048630 -15.823356 +v 103.357063 -106.447914 -4.284535 +v 155.035583 -106.447922 -4.284539 +v 157.535583 -103.947922 -4.284539 +v -157.535477 -103.947891 -4.284513 +v -155.035477 -106.447891 -4.284513 +v -103.356987 -106.447899 -4.284516 +v -103.356987 -106.447899 -4.284516 +v -51.678474 -106.447899 -4.284522 +v -157.535477 -103.947891 -4.284513 +v -51.678474 -106.447899 -4.284522 +v 0.000038 -106.447906 -4.284526 +v -157.535477 -103.947891 -4.284513 +v -157.535477 -103.947891 -4.284513 +v 0.000038 -106.447906 -4.284526 +v 157.535583 -103.947922 -4.284539 +v 0.000038 -106.447906 -4.284526 +v 51.678551 -106.447914 -4.284530 +v 157.535583 -103.947922 -4.284539 +v 157.535583 -103.947922 -4.284539 +v 51.678551 -106.447914 -4.284530 +v 103.357063 -106.447914 -4.284535 +v -154.783401 -106.447891 -3.284512 +v -155.035477 -106.447891 -3.255711 +v -154.148178 -107.094444 -3.284512 +v -155.035477 -106.447891 -3.255711 +v -158.650452 -110.969971 -2.393444 +v -154.148178 -107.094444 -3.284512 +v -154.148178 -107.094444 -3.284512 +v -158.650452 -110.969971 -2.393444 +v -154.122742 -112.603630 -2.636372 +v -158.650452 -110.969971 -2.393444 +v -160.458160 -117.458786 -1.493846 +v -154.122742 -112.603630 -2.636372 +v -154.122742 -112.603630 -2.636372 +v -160.458160 -117.458786 -1.493846 +v -154.111511 -122.329681 -1.492130 +v -169.652954 -110.360443 -1.500827 +v -169.315826 -110.621979 -1.500438 +v -163.553604 -106.947090 -2.395816 +v -169.315826 -110.621979 -1.500438 +v -165.245087 -113.771347 -1.496631 +v -163.553604 -106.947090 -2.395816 +v -163.553604 -106.947090 -2.395816 +v -165.245087 -113.771347 -1.496631 +v -158.650452 -110.969971 -2.393444 +v -165.245087 -113.771347 -1.496631 +v -161.198303 -116.889557 -1.494174 +v -158.650452 -110.969971 -2.393444 +v -158.650452 -110.969971 -2.393444 +v -161.198303 -116.889557 -1.494174 +v -160.458160 -117.458786 -1.493846 +v -178.798965 -103.199432 -1.518039 +v -174.699203 -99.071297 -2.276561 +v -179.572159 -102.585800 -1.520319 +v -174.699203 -99.071297 -2.276561 +v -180.995377 -99.075989 -1.772868 +v -179.572159 -102.585800 -1.520319 +v -178.798965 -103.199432 -1.518039 +v -177.501694 -104.225273 -1.514582 +v -174.699203 -99.071297 -2.276561 +v -177.501694 -104.225273 -1.514582 +v -175.440811 -105.846649 -1.509921 +v -174.699203 -99.071297 -2.276561 +v -174.699203 -99.071297 -2.276561 +v -175.440811 -105.846649 -1.509921 +v -169.582657 -99.065201 -2.685879 +v -175.440811 -105.846649 -1.509921 +v -173.391022 -107.451050 -1.506114 +v -169.582657 -99.065201 -2.685879 +v -169.582657 -99.065201 -2.685879 +v -173.391022 -107.451050 -1.506114 +v -171.129089 -109.213722 -1.502696 +v -183.941238 -99.077583 -1.537196 +v -183.762741 -99.222572 -1.536342 +v -180.995377 -99.075989 -1.772868 +v -183.762741 -99.222572 -1.536342 +v -181.658646 -100.920105 -1.527430 +v -180.995377 -99.075989 -1.772868 +v -180.995377 -99.075989 -1.772868 +v -181.658646 -100.920105 -1.527430 +v -179.572159 -102.585800 -1.520319 +v -155.035477 -106.447891 -3.255711 +v -157.535477 -103.947891 -3.255894 +v -158.650452 -110.969971 -2.393444 +v -157.535477 -103.947891 -3.255894 +v -158.999954 -103.947891 -3.115780 +v -158.650452 -110.969971 -2.393444 +v -158.650452 -110.969971 -2.393444 +v -158.999954 -103.947891 -3.115780 +v -163.553604 -106.947090 -2.395816 +v -158.999954 -103.947891 -3.115780 +v -158.999954 -102.483429 -3.256306 +v -163.553604 -106.947090 -2.395816 +v -163.553604 -106.947090 -2.395816 +v -158.999954 -102.483429 -3.256306 +v -161.499954 -99.983421 -3.257260 +v -161.499954 -99.651382 -3.284512 +v -162.099808 -99.046623 -3.284512 +v -161.499954 -99.983421 -3.257260 +v -162.099808 -99.046623 -3.284512 +v -169.582657 -99.065201 -2.685879 +v -161.499954 -99.983421 -3.257260 +v -161.499954 -99.983421 -3.257260 +v -169.582657 -99.065201 -2.685879 +v -163.553604 -106.947090 -2.395816 +v -169.582657 -99.065201 -2.685879 +v -171.129089 -109.213722 -1.502696 +v -163.553604 -106.947090 -2.395816 +v -163.553604 -106.947090 -2.395816 +v -171.129089 -109.213722 -1.502696 +v -169.652954 -110.360443 -1.500827 +v -183.406631 -102.404869 -7.578935 +v -185.567062 -100.064392 -6.939280 +v -187.499954 -97.970436 -11.478952 +v -185.567062 -100.064392 -6.939280 +v -185.703140 -99.916954 -6.898806 +v -187.499954 -97.970436 -11.478952 +v -187.499954 -97.970436 -11.478952 +v -185.703140 -99.916954 -6.898806 +v -187.499954 -97.970436 -6.362200 +v -176.923187 -109.428604 -9.472957 +v -179.084610 -107.087059 -8.845102 +v -187.499954 -97.970436 -11.478952 +v -179.084610 -107.087059 -8.845102 +v -181.245773 -104.745789 -8.213961 +v -187.499954 -97.970436 -11.478952 +v -187.499954 -97.970436 -11.478952 +v -181.245773 -104.745789 -8.213961 +v -183.406631 -102.404869 -7.578935 +v -152.905396 -135.447891 -20.784512 +v -152.905396 -135.447891 -16.681421 +v -153.999969 -134.262085 -20.784512 +v -152.905396 -135.447891 -16.681421 +v -153.252411 -135.071945 -16.224909 +v -153.999969 -134.262085 -20.784512 +v -153.999969 -134.262085 -20.784512 +v -153.252411 -135.071945 -16.224909 +v -161.747711 -125.868698 -13.819559 +v -161.747711 -125.868698 -13.819559 +v -166.091156 -121.163300 -12.583697 +v -153.999969 -134.262085 -20.784512 +v -166.091156 -121.163300 -12.583697 +v -170.243683 -116.664734 -11.396892 +v -153.999969 -134.262085 -20.784512 +v -153.999969 -134.262085 -20.784512 +v -170.243683 -116.664734 -11.396892 +v -187.499954 -97.970436 -11.478952 +v -170.243683 -116.664734 -11.396892 +v -174.863312 -111.660149 -10.068644 +v -187.499954 -97.970436 -11.478952 +v -187.499954 -97.970436 -11.478952 +v -174.863312 -111.660149 -10.068644 +v -176.923187 -109.428604 -9.472957 +v -155.035477 -106.447891 -4.284513 +v -157.535477 -103.947891 -4.284513 +v -155.035477 -106.447891 -3.255711 +v -157.535477 -103.947891 -4.284513 +v -157.535477 -103.947891 -3.255894 +v -155.035477 -106.447891 -3.255711 +v -161.499939 115.052109 -4.284528 +v -161.499939 115.052109 -3.284528 +v -161.499954 -99.983421 -4.284512 +v -161.499939 115.052109 -3.284528 +v -161.499954 -99.651382 -3.284512 +v -161.499954 -99.983421 -4.284512 +v -161.499954 -99.983421 -4.284512 +v -161.499954 -99.651382 -3.284512 +v -161.499954 -99.983421 -3.257260 +v -187.499954 -97.942810 -6.297656 +v -187.499939 115.052109 -6.297672 +v -187.499954 -97.970436 -6.362200 +v -187.499939 115.052109 -6.297672 +v -187.499939 115.052109 -11.478969 +v -187.499954 -97.970436 -6.362200 +v -187.499954 -97.970436 -6.362200 +v -187.499939 115.052109 -11.478969 +v -187.499954 -97.970436 -11.478952 +v 152.905457 -135.447922 -20.784538 +v 152.905457 -135.447922 -16.681448 +v -152.905396 -135.447891 -20.784512 +v 152.905457 -135.447922 -16.681448 +v -152.905396 -135.447891 -16.681421 +v -152.905396 -135.447891 -20.784512 +v 185.000046 -96.922371 -6.810834 +v 185.000061 115.052078 -6.810850 +v 185.000046 -96.992996 -6.970990 +v 185.000061 115.052078 -6.810850 +v 185.000061 115.052078 -12.173444 +v 185.000046 -96.992996 -6.970990 +v 185.000046 -96.992996 -6.970990 +v 185.000061 115.052078 -12.173444 +v 185.000046 -96.992996 -12.173429 +v -162.499954 -102.518959 -5.760487 +v -162.499939 115.052109 -5.760503 +v -162.499954 -102.518959 -6.784512 +v -162.499939 115.052109 -5.760503 +v -162.499939 115.052109 -6.784528 +v -162.499954 -102.518959 -6.784512 +v 159.000046 -102.483459 -4.284539 +v 161.500046 -99.983452 -4.284541 +v 159.000061 113.052078 -4.284555 +v 161.500046 -99.983452 -4.284541 +v 161.500061 115.052078 -4.284557 +v 159.000061 113.052078 -4.284555 +v 159.000061 113.052078 -4.284555 +v 161.500061 115.052078 -4.284557 +v -158.999939 113.052109 -4.284529 +v 161.500061 115.052078 -4.284557 +v -161.499939 115.052109 -4.284528 +v -158.999939 113.052109 -4.284529 +v -158.999939 113.052109 -4.284529 +v -161.499939 115.052109 -4.284528 +v -158.999954 -102.483429 -4.284513 +v -161.499939 115.052109 -4.284528 +v -161.499954 -99.983421 -4.284512 +v -158.999954 -102.483429 -4.284513 +v -161.499939 115.052109 -3.284528 +v -162.099792 115.052109 -3.284528 +v -161.499954 -99.651382 -3.284512 +v -162.099792 115.052109 -3.284528 +v -162.099808 -99.046623 -3.284512 +v -161.499954 -99.651382 -3.284512 +vn -0.7348 0.6783 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 0.7348 0.6783 -0.0000 +vn 0.7349 0.6782 -0.0000 +vn -0.9191 -0.0000 0.3939 +vn -0.0944 0.0944 0.9911 +vn -0.0882 0.1164 0.9893 +vn -0.0863 0.0863 0.9925 +vn -0.0793 0.1047 0.9913 +vn -0.0896 0.1113 0.9897 +vn -0.1041 0.1041 0.9891 +vn -0.0936 0.1163 0.9888 +vn -0.0858 0.1132 0.9899 +vn -0.0877 0.1090 0.9902 +vn -0.0835 0.1102 0.9904 +vn -0.1130 -0.0982 -0.9887 +vn -0.1060 -0.1042 -0.9889 +vn -0.0952 -0.1167 -0.9886 +vn -0.0944 -0.0948 -0.9910 +vn -0.0813 -0.0987 -0.9918 +vn -0.0795 -0.0815 -0.9935 +vn -0.0793 -0.0787 -0.9937 +vn -0.0793 -0.1034 -0.9915 +vn -0.0792 -0.1035 -0.9915 +vn -0.0793 -0.1035 -0.9915 +vn -0.0839 -0.1097 -0.9904 +vn -0.0875 -0.1034 -0.9908 +vn -0.0866 -0.1131 -0.9898 +vn -0.0886 -0.1085 -0.9901 +vn -0.0932 -0.1141 -0.9891 +vn -0.0945 -0.0946 -0.9910 +vn -0.0932 -0.1112 -0.9894 +vn -0.0891 -0.1165 -0.9892 +vn -0.0000 -0.7719 0.6357 +vn -0.0000 0.1168 0.9932 +vn 0.5903 -0.6630 0.4605 +vn 0.6390 -0.7013 0.3162 +vn 0.5679 -0.7497 0.3397 +vn 0.5803 -0.7660 0.2765 +vn 0.5766 -0.6900 0.4375 +vn 0.5780 -0.6575 0.4833 +vn 0.5776 -0.6716 0.4640 +vn 0.5660 -0.6650 0.4872 +vn 0.5676 -0.6526 0.5019 +vn 0.5562 -0.6592 0.5061 +vn 0.5530 -0.6729 0.4913 +vn 0.5438 -0.6661 0.5105 +vn 0.5386 -0.6813 0.4957 +vn 0.6215 -0.7187 0.3117 +vn 0.6116 -0.7283 0.3092 +vn 0.6331 -0.7250 0.2713 +vn 0.6060 -0.7426 0.2853 +vn 0.6170 -0.7319 0.2890 +vn 0.6008 -0.7384 0.3063 +vn 0.5846 -0.7717 0.2505 +vn 0.5938 -0.7539 0.2811 +vn 0.5986 -0.7589 0.2565 +vn 0.5844 -0.7443 0.3232 +vn 0.5959 -0.7342 0.3255 +vn 0.5800 -0.7396 0.3414 +vn 0.5717 -0.7307 0.3731 +vn 0.5604 -0.7397 0.3727 +vn 0.5844 -0.7443 0.3233 +vn 0.5720 -0.7550 0.3207 +vn 0.5890 -0.7491 0.3032 +vn 0.6008 -0.7384 0.3064 +vn 0.5911 -0.7301 0.3429 +vn 0.5822 -0.7222 0.3735 +vn 0.5641 -0.7225 0.3998 +vn 0.5741 -0.7148 0.3993 +vn 0.5600 -0.7018 0.4404 +vn 0.5562 -0.6857 0.4695 +vn 0.5685 -0.6958 0.4390 +vn 0.6592 -0.6968 0.2825 +vn 0.6467 -0.6932 0.3181 +vn 0.6513 -0.7057 0.2791 +vn 0.5756 -0.7014 0.4203 +vn 0.5667 -0.7080 0.4214 +vn 0.5921 -0.7006 0.3983 +vn 0.6010 -0.7064 0.3740 +vn 0.5919 -0.7141 0.3738 +vn 0.6108 -0.7125 0.3455 +vn 0.6365 -0.7124 0.2956 +vn 0.6272 -0.7219 0.2924 +vn 0.5637 -0.6808 0.4676 +vn 0.5993 -0.6832 0.4173 +vn 0.5840 -0.6951 0.4193 +vn 0.6079 -0.6875 0.3973 +vn 0.6173 -0.6920 0.3742 +vn 0.6276 -0.6966 0.3475 +vn 0.6195 -0.7043 0.3465 +vn 0.6306 -0.7097 0.3140 +vn 0.6306 -0.7098 0.3140 +vn 0.6426 -0.7150 0.2754 +vn 0.5304 -0.6733 0.5150 +vn 0.5293 -0.6549 0.5394 +vn 0.5403 -0.6495 0.5349 +vn 0.5507 -0.6444 0.5306 +vn 0.5413 -0.7145 0.4433 +vn 0.5400 -0.6959 0.4734 +vn 0.5312 -0.7012 0.4755 +vn 0.5309 -0.6857 0.4979 +vn 0.5229 -0.6902 0.5002 +vn 0.5159 -0.6810 0.5198 +vn 0.5175 -0.6605 0.5440 +vn 0.5470 -0.7221 0.4234 +vn 0.5572 -0.7149 0.4224 +vn 0.5509 -0.7080 0.4419 +vn 0.5483 -0.6907 0.4715 +vn 0.5483 -0.6907 0.4714 +vn 0.5460 -0.6771 0.4935 +vn 0.5914 -0.6791 0.4348 +vn 0.6129 -0.6722 0.4153 +vn 0.6218 -0.6756 0.3962 +vn 0.6316 -0.6790 0.3743 +vn 0.6423 -0.6824 0.3491 +vn 0.6352 -0.6893 0.3483 +vn 0.6539 -0.6856 0.3199 +vn -0.0000 -0.0000 1.0000 +vn 0.0797 -0.0000 -0.9968 +vn -0.6047 -0.6690 0.4322 +vn -0.6539 -0.6856 0.3199 +vn -0.5604 -0.7397 0.3727 +vn -0.5600 -0.7018 0.4404 +vn -0.6113 -0.7468 0.2620 +vn -0.6112 -0.7468 0.2620 +vn -0.5660 -0.6650 0.4872 +vn -0.5309 -0.6857 0.4979 +vn -0.5312 -0.7012 0.4755 +vn -0.5159 -0.6810 0.5198 +vn -0.5386 -0.6813 0.4957 +vn -0.5304 -0.6733 0.5150 +vn -0.5530 -0.6729 0.4913 +vn -0.5438 -0.6661 0.5105 +vn -0.5562 -0.6592 0.5061 +vn -0.5780 -0.6575 0.4833 +vn -0.5766 -0.6900 0.4375 +vn -0.5756 -0.7014 0.4203 +vn -0.5840 -0.6951 0.4193 +vn -0.5741 -0.7148 0.3993 +vn -0.5921 -0.7006 0.3983 +vn -0.5986 -0.7589 0.2565 +vn -0.5938 -0.7539 0.2811 +vn -0.6060 -0.7426 0.2852 +vn -0.6008 -0.7383 0.3064 +vn -0.6008 -0.7384 0.3063 +vn -0.6063 -0.7246 0.3275 +vn -0.5911 -0.7301 0.3430 +vn -0.5911 -0.7301 0.3429 +vn -0.5844 -0.7443 0.3232 +vn -0.5959 -0.7342 0.3255 +vn -0.5890 -0.7491 0.3032 +vn -0.5937 -0.7540 0.2811 +vn -0.5803 -0.7660 0.2765 +vn -0.5717 -0.7307 0.3731 +vn -0.5800 -0.7396 0.3414 +vn -0.5720 -0.7550 0.3207 +vn -0.5844 -0.7443 0.3233 +vn -0.5761 -0.7604 0.2998 +vn -0.5534 -0.7305 0.4002 +vn -0.5667 -0.7080 0.4214 +vn -0.5572 -0.7149 0.4224 +vn -0.6272 -0.7219 0.2925 +vn -0.6215 -0.7187 0.3117 +vn -0.6013 -0.7210 0.3443 +vn -0.6108 -0.7125 0.3455 +vn -0.5919 -0.7141 0.3738 +vn -0.5822 -0.7222 0.3735 +vn -0.5641 -0.7225 0.3998 +vn -0.5483 -0.6907 0.4715 +vn -0.5685 -0.6958 0.4390 +vn -0.5562 -0.6857 0.4695 +vn -0.5637 -0.6808 0.4676 +vn -0.6666 -0.6885 0.2857 +vn -0.6467 -0.6932 0.3181 +vn -0.6592 -0.6968 0.2825 +vn -0.6390 -0.7013 0.3162 +vn -0.6306 -0.7098 0.3140 +vn -0.5993 -0.6832 0.4173 +vn -0.6129 -0.6722 0.4153 +vn -0.6079 -0.6875 0.3973 +vn -0.6218 -0.6756 0.3962 +vn -0.6173 -0.6920 0.3742 +vn -0.6316 -0.6790 0.3743 +vn -0.6277 -0.6966 0.3475 +vn -0.6352 -0.6893 0.3483 +vn -0.6450 -0.7035 0.2984 +vn -0.6426 -0.7150 0.2754 +vn -0.5048 -0.6664 0.5488 +vn -0.5175 -0.6605 0.5440 +vn -0.5293 -0.6549 0.5394 +vn -0.5403 -0.6495 0.5349 +vn -0.5676 -0.6526 0.5019 +vn -0.5776 -0.6716 0.4640 +vn -0.5460 -0.6771 0.4935 +vn -0.5483 -0.6907 0.4714 +vn -0.5400 -0.6959 0.4734 +vn -0.5509 -0.7080 0.4419 +vn -0.5413 -0.7145 0.4433 +vn -0.6331 -0.7250 0.2713 +vn -0.6365 -0.7124 0.2956 +vn -0.6195 -0.7043 0.3465 +vn -0.6010 -0.7064 0.3740 +vn -0.5914 -0.6791 0.4348 +vn -0.5903 -0.6630 0.4605 +vn 0.0797 -0.0000 0.9968 +vn 0.7348 -0.6783 -0.0000 +vn -0.0000 -1.0000 -0.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.6365 0.7008 -0.3221 +vn -0.6600 0.6907 -0.2955 +vn -0.6482 0.6888 -0.3246 +vn -0.6470 0.7048 -0.2909 +vn -0.6468 0.7046 -0.2917 +vn -0.6359 0.7014 -0.3220 +vn -0.6391 0.7126 -0.2893 +vn -0.6034 0.7341 -0.3115 +vn -0.6047 0.7397 -0.2953 +vn -0.5936 0.7254 -0.3485 +vn -0.5895 0.7289 -0.3482 +vn -0.5755 0.7265 -0.3756 +vn -0.5764 0.7249 -0.3773 +vn -0.5786 0.7231 -0.3773 +vn -0.5694 0.7051 -0.4227 +vn -0.5606 0.7114 -0.4239 +vn -0.5768 0.7114 -0.4016 +vn -0.5763 0.7117 -0.4017 +vn -0.5559 0.6933 -0.4586 +vn -0.5515 0.7069 -0.4429 +vn -0.5532 0.7057 -0.4426 +vn -0.5415 0.6799 -0.4944 +vn -0.5311 0.6859 -0.4975 +vn -0.5513 0.6888 -0.4708 +vn -0.5402 0.6956 -0.4736 +vn -0.5408 0.6953 -0.4734 +vn -0.5211 0.6789 -0.5173 +vn -0.5219 0.6783 -0.5172 +vn -0.5227 0.6779 -0.5170 +vn -0.5309 0.6553 -0.5373 +vn -0.6488 0.6882 -0.3248 +vn -0.6491 0.6879 -0.3248 +vn -0.6249 0.6967 -0.3522 +vn -0.6378 0.6845 -0.3530 +vn -0.6151 0.6921 -0.3777 +vn -0.6276 0.6810 -0.3773 +vn -0.6060 0.6876 -0.3998 +vn -0.6182 0.6775 -0.3985 +vn -0.5978 0.6834 -0.4191 +vn -0.6096 0.6741 -0.4171 +vn -0.5906 0.6795 -0.4353 +vn -0.6019 0.6706 -0.4336 +vn -0.5497 0.6459 -0.5297 +vn -0.5562 0.6596 -0.5055 +vn -0.5658 0.6541 -0.5020 +vn -0.5658 0.6653 -0.4870 +vn -0.5656 0.6655 -0.4871 +vn -0.5772 0.6719 -0.4641 +vn -0.5644 0.6802 -0.4677 +vn -0.5097 0.6653 -0.5455 +vn -0.5215 0.6614 -0.5390 +vn -0.5333 0.6723 -0.5135 +vn -0.5331 0.6724 -0.5135 +vn -0.5542 0.6725 -0.4905 +vn -0.5412 0.6800 -0.4946 +vn -0.6205 0.7166 -0.3185 +vn -0.6176 0.7277 -0.2983 +vn -0.6211 0.7160 -0.3186 +vn -0.6214 0.7160 -0.3182 +vn -0.6119 0.7249 -0.3165 +vn -0.6081 0.7369 -0.2954 +vn -0.5408 0.6504 -0.5334 +vn -0.5452 0.6658 -0.5094 +vn -0.5560 0.6598 -0.5055 +vn -0.5541 0.6724 -0.4907 +vn -0.5539 0.6726 -0.4908 +vn -0.5648 0.6801 -0.4674 +vn -0.5645 0.6803 -0.4675 +vn -0.5628 0.6991 -0.4411 +vn -0.5771 0.6891 -0.4383 +vn -0.5693 0.7050 -0.4229 +vn -0.5843 0.6940 -0.4207 +vn -0.5766 0.7113 -0.4019 +vn -0.5921 0.6993 -0.4006 +vn -0.5847 0.7180 -0.3776 +vn -0.6007 0.7049 -0.3773 +vn -0.5935 0.7252 -0.3490 +vn -0.5927 0.7259 -0.3489 +vn -0.6033 0.7329 -0.3146 +vn -0.5995 0.7363 -0.3138 +vn -0.6111 0.7393 -0.2827 +vn -0.6114 0.7395 -0.2818 +vn -0.6172 0.7283 -0.2977 +vn -0.6213 0.7302 -0.2845 +vn -0.6261 0.7196 -0.3004 +vn -0.6304 0.7213 -0.2869 +vn -0.6306 0.7208 -0.2876 +vn -0.6284 0.7089 -0.3203 +vn -0.6210 0.7160 -0.3190 +vn -0.6178 0.7035 -0.3513 +vn -0.6105 0.7101 -0.3508 +vn -0.6152 0.6922 -0.3774 +vn -0.6010 0.7043 -0.3777 +vn -0.6062 0.6877 -0.3995 +vn -0.5924 0.6989 -0.4009 +vn -0.5979 0.6834 -0.4189 +vn -0.5845 0.6937 -0.4210 +vn -0.5903 0.6794 -0.4358 +vn -0.5906 0.6792 -0.4358 +vn -0.5763 0.6717 -0.4655 +vn -0.5880 0.6645 -0.4612 +vn -0.7348 -0.6783 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.2676 -0.0000 -0.9635 +vn -0.9191 -0.0000 -0.3939 +vn -0.9192 -0.0000 -0.3939 +vn 0.0835 0.1102 0.9904 +vn 0.0877 0.1090 0.9902 +vn 0.0858 0.1132 0.9899 +vn 0.0936 0.1163 0.9888 +vn 0.0793 0.1047 0.9913 +vn 0.0845 0.0845 0.9928 +vn 0.0814 0.1074 0.9909 +vn 0.0825 0.1025 0.9913 +vn 0.0944 0.0944 0.9911 +vn 0.0859 0.1067 0.9906 +vn 0.1041 0.1041 0.9891 +vn 0.0896 0.1113 0.9897 +vn 0.1161 0.1161 0.9864 +vn -0.7071 -0.7071 -0.0000 +vn 0.5925 0.6989 -0.4005 +vn 0.6468 0.7046 -0.2917 +vn 0.5097 0.6653 -0.5455 +vn 0.5203 0.6603 -0.5415 +vn 0.5105 0.6650 -0.5451 +vn 0.5320 0.6710 -0.5165 +vn 0.5219 0.6783 -0.5172 +vn 0.5331 0.6724 -0.5134 +vn 0.5295 0.6868 -0.4980 +vn 0.5424 0.6951 -0.4718 +vn 0.5408 0.6953 -0.4734 +vn 0.5402 0.6956 -0.4736 +vn 0.5391 0.6963 -0.4739 +vn 0.5629 0.6992 -0.4409 +vn 0.5625 0.6994 -0.4409 +vn 0.5587 0.7128 -0.4241 +vn 0.5995 0.7362 -0.3138 +vn 0.5971 0.7384 -0.3134 +vn 0.5929 0.7260 -0.3484 +vn 0.5856 0.7321 -0.3479 +vn 0.5842 0.7186 -0.3772 +vn 0.5764 0.7248 -0.3773 +vn 0.5815 0.7156 -0.3870 +vn 0.5685 0.7176 -0.4023 +vn 0.6047 0.7397 -0.2952 +vn 0.6034 0.7341 -0.3115 +vn 0.6024 0.7335 -0.3147 +vn 0.6032 0.7328 -0.3149 +vn 0.6209 0.7300 -0.2857 +vn 0.6343 0.7111 -0.3034 +vn 0.6304 0.7213 -0.2869 +vn 0.6301 0.7211 -0.2880 +vn 0.6470 0.7048 -0.2909 +vn 0.6482 0.6888 -0.3246 +vn 0.6600 0.6907 -0.2955 +vn 0.6064 0.6874 -0.3998 +vn 0.6179 0.6778 -0.3986 +vn 0.6155 0.6917 -0.3777 +vn 0.6272 0.6813 -0.3773 +vn 0.6255 0.6962 -0.3522 +vn 0.6375 0.6849 -0.3530 +vn 0.6015 0.6710 -0.4336 +vn 0.5909 0.6793 -0.4352 +vn 0.5875 0.6648 -0.4614 +vn 0.5766 0.6715 -0.4654 +vn 0.5759 0.6592 -0.4836 +vn 0.5658 0.6654 -0.4870 +vn 0.5658 0.6541 -0.5020 +vn 0.5663 0.6539 -0.5018 +vn 0.5540 0.6726 -0.4906 +vn 0.5415 0.6799 -0.4945 +vn 0.5450 0.6660 -0.5094 +vn 0.5452 0.6658 -0.5093 +vn 0.5308 0.6553 -0.5374 +vn 0.6171 0.7282 -0.2982 +vn 0.6265 0.7192 -0.3005 +vn 0.6204 0.7165 -0.3189 +vn 0.5762 0.7116 -0.4020 +vn 0.6012 0.7044 -0.3773 +vn 0.5841 0.7185 -0.3776 +vn 0.6107 0.7102 -0.3502 +vn 0.6017 0.7181 -0.3496 +vn 0.5413 0.6801 -0.4945 +vn 0.5512 0.6887 -0.4710 +vn 0.5508 0.6890 -0.4711 +vn 0.5775 0.6888 -0.4382 +vn 0.5624 0.6994 -0.4411 +vn 0.6466 0.7046 -0.2924 +vn 0.6283 0.7089 -0.3206 +vn 0.6210 0.7159 -0.3193 +vn 0.6210 0.7160 -0.3190 +vn 0.6211 0.7160 -0.3186 +vn 0.6118 0.7248 -0.3169 +vn 0.6177 0.7278 -0.2978 +vn 0.6076 0.7373 -0.2953 +vn 0.6111 0.7393 -0.2827 +vn 0.5982 0.6832 -0.4188 +vn 0.5980 0.6832 -0.4191 +vn 0.6093 0.6743 -0.4172 +vn 0.5842 0.6939 -0.4210 +vn 0.6065 0.6874 -0.3995 +vn 0.5920 0.6992 -0.4009 +vn 0.6156 0.6918 -0.3774 +vn 0.6005 0.7048 -0.3777 +vn 0.6256 0.6963 -0.3518 +vn 0.6251 0.6968 -0.3517 +vn 0.6364 0.7007 -0.3225 +vn 0.6489 0.6881 -0.3248 +vn 0.5666 0.7190 -0.4024 +vn 0.5691 0.7053 -0.4227 +vn 0.5690 0.7053 -0.4229 +vn 0.5846 0.6938 -0.4206 +vn 0.5770 0.6890 -0.4385 +vn 0.5774 0.6888 -0.4385 +vn 0.5769 0.6721 -0.4642 +vn 0.5647 0.6800 -0.4676 +vn 0.5657 0.6655 -0.4869 +vn 0.5541 0.6724 -0.4907 +vn 0.5560 0.6598 -0.5055 +vn 0.5562 0.6596 -0.5054 +vn 0.5407 0.6504 -0.5335 +vn 0.2676 -0.0000 -0.9635 +vn -0.0000 1.0000 -0.0000 +vn -0.0797 -0.0000 0.9968 +vn 0.9191 -0.0000 0.3939 +vn -0.0000 -0.1168 -0.9932 +vn -0.0000 0.7719 -0.6357 +vn 1.0000 0.0001 -0.0000 +vn -0.0797 -0.0000 -0.9968 +vn 0.7071 -0.7071 -0.0000 +vn 0.9191 -0.0000 -0.3939 +vn 0.9192 -0.0000 -0.3939 +vn 0.0952 -0.1167 -0.9886 +vn 0.0932 -0.1112 -0.9894 +vn 0.0891 -0.1165 -0.9892 +vn 0.0886 -0.1085 -0.9901 +vn 0.0866 -0.1131 -0.9898 +vn 0.0839 -0.1097 -0.9904 +vn 0.0792 -0.1035 -0.9915 +vn 0.0793 -0.1034 -0.9915 +vn 0.0822 -0.0815 -0.9933 +vn 0.0793 -0.0797 -0.9937 +vn 0.0862 -0.1024 -0.9910 +vn 0.0880 -0.1038 -0.9907 +vn 0.0865 -0.1060 -0.9906 +vn 0.1047 -0.1048 -0.9890 +vn 0.1071 -0.1029 -0.9889 +vn 0.1128 -0.1108 -0.9874 +vn 0.9192 -0.0000 0.3939 +vn 0.5925 -0.6989 0.4005 +vn 0.6468 -0.7046 0.2917 +vn 0.5097 -0.6653 0.5455 +vn 0.5203 -0.6603 0.5415 +vn 0.5105 -0.6650 0.5451 +vn 0.5320 -0.6710 0.5165 +vn 0.5219 -0.6783 0.5172 +vn 0.5331 -0.6724 0.5134 +vn 0.5295 -0.6868 0.4980 +vn 0.5424 -0.6951 0.4718 +vn 0.5408 -0.6953 0.4734 +vn 0.5402 -0.6956 0.4736 +vn 0.5391 -0.6963 0.4739 +vn 0.5629 -0.6992 0.4409 +vn 0.5625 -0.6994 0.4409 +vn 0.5587 -0.7128 0.4241 +vn 0.5994 -0.7363 0.3138 +vn 0.5971 -0.7384 0.3134 +vn 0.5929 -0.7260 0.3485 +vn 0.5856 -0.7321 0.3480 +vn 0.5842 -0.7186 0.3772 +vn 0.5764 -0.7249 0.3773 +vn 0.5815 -0.7156 0.3869 +vn 0.5685 -0.7176 0.4023 +vn 0.6047 -0.7397 0.2953 +vn 0.6034 -0.7341 0.3115 +vn 0.6024 -0.7335 0.3147 +vn 0.6032 -0.7328 0.3149 +vn 0.6209 -0.7300 0.2857 +vn 0.6343 -0.7111 0.3033 +vn 0.6304 -0.7213 0.2869 +vn 0.6301 -0.7212 0.2880 +vn 0.6470 -0.7048 0.2909 +vn 0.6482 -0.6888 0.3246 +vn 0.6600 -0.6907 0.2955 +vn 0.6064 -0.6874 0.3998 +vn 0.6179 -0.6778 0.3986 +vn 0.6155 -0.6917 0.3777 +vn 0.6272 -0.6813 0.3773 +vn 0.6255 -0.6962 0.3522 +vn 0.6375 -0.6849 0.3529 +vn 0.6015 -0.6710 0.4336 +vn 0.5909 -0.6793 0.4352 +vn 0.5875 -0.6648 0.4614 +vn 0.5766 -0.6715 0.4654 +vn 0.5759 -0.6592 0.4836 +vn 0.5658 -0.6653 0.4870 +vn 0.5658 -0.6541 0.5020 +vn 0.5663 -0.6539 0.5018 +vn 0.5540 -0.6726 0.4906 +vn 0.5415 -0.6799 0.4945 +vn 0.5450 -0.6660 0.5094 +vn 0.5452 -0.6658 0.5093 +vn 0.5308 -0.6553 0.5374 +vn 0.6171 -0.7282 0.2982 +vn 0.6265 -0.7192 0.3006 +vn 0.6204 -0.7165 0.3189 +vn 0.5762 -0.7116 0.4020 +vn 0.6012 -0.7044 0.3773 +vn 0.5841 -0.7185 0.3776 +vn 0.6107 -0.7102 0.3502 +vn 0.6017 -0.7181 0.3496 +vn 0.5413 -0.6801 0.4945 +vn 0.5512 -0.6887 0.4710 +vn 0.5508 -0.6890 0.4711 +vn 0.5775 -0.6888 0.4382 +vn 0.5624 -0.6993 0.4411 +vn 0.6466 -0.7046 0.2924 +vn 0.6283 -0.7089 0.3206 +vn 0.6210 -0.7159 0.3192 +vn 0.6210 -0.7160 0.3190 +vn 0.6211 -0.7160 0.3186 +vn 0.6118 -0.7248 0.3169 +vn 0.6177 -0.7278 0.2978 +vn 0.6076 -0.7373 0.2953 +vn 0.6111 -0.7394 0.2827 +vn 0.5982 -0.6832 0.4188 +vn 0.5980 -0.6832 0.4191 +vn 0.6093 -0.6743 0.4172 +vn 0.5842 -0.6939 0.4210 +vn 0.6065 -0.6874 0.3995 +vn 0.5920 -0.6992 0.4009 +vn 0.6156 -0.6918 0.3774 +vn 0.6005 -0.7048 0.3777 +vn 0.6256 -0.6963 0.3518 +vn 0.6251 -0.6968 0.3517 +vn 0.6364 -0.7007 0.3225 +vn 0.6488 -0.6881 0.3248 +vn 0.5666 -0.7190 0.4024 +vn 0.5691 -0.7053 0.4227 +vn 0.5690 -0.7053 0.4229 +vn 0.5846 -0.6938 0.4206 +vn 0.5770 -0.6890 0.4385 +vn 0.5774 -0.6888 0.4385 +vn 0.5769 -0.6721 0.4642 +vn 0.5647 -0.6800 0.4676 +vn 0.5657 -0.6655 0.4869 +vn 0.5541 -0.6724 0.4907 +vn 0.5560 -0.6598 0.5055 +vn 0.5562 -0.6596 0.5054 +vn 0.5407 -0.6504 0.5335 +vn -1.0000 -0.0001 -0.0000 +vn -0.7071 0.7071 -0.0000 +vn -0.0948 0.0949 0.9910 +vn -0.0947 0.0951 0.9910 +vn -0.0793 0.1034 0.9915 +vn -0.0792 0.1035 0.9915 +vn -0.0875 0.1034 0.9908 +vn -0.0866 0.1131 0.9898 +vn -0.0886 0.1085 0.9901 +vn -0.0839 0.1097 0.9904 +vn -0.0891 0.1165 0.9892 +vn -0.0932 0.1112 0.9894 +vn -0.0952 0.1167 0.9886 +vn -0.1060 0.1042 0.9889 +vn -0.0793 0.0787 0.9937 +vn -0.0795 0.0815 0.9935 +vn -0.0813 0.0987 0.9918 +vn -0.0942 0.0948 0.9910 +vn -0.0867 0.1062 0.9906 +vn -0.1023 0.1068 0.9890 +vn -0.1130 0.0982 0.9887 +vn 0.0798 -0.0000 -0.9968 +vn -0.6365 -0.7008 0.3221 +vn -0.6600 -0.6907 0.2955 +vn -0.6482 -0.6888 0.3246 +vn -0.6470 -0.7048 0.2909 +vn -0.6468 -0.7046 0.2917 +vn -0.6359 -0.7014 0.3220 +vn -0.6391 -0.7126 0.2893 +vn -0.6034 -0.7341 0.3115 +vn -0.6047 -0.7397 0.2952 +vn -0.5936 -0.7254 0.3485 +vn -0.5895 -0.7289 0.3482 +vn -0.5755 -0.7265 0.3756 +vn -0.5764 -0.7248 0.3773 +vn -0.5786 -0.7231 0.3773 +vn -0.5694 -0.7050 0.4227 +vn -0.5606 -0.7114 0.4239 +vn -0.5768 -0.7114 0.4016 +vn -0.5763 -0.7117 0.4017 +vn -0.5559 -0.6933 0.4586 +vn -0.5515 -0.7069 0.4429 +vn -0.5532 -0.7057 0.4426 +vn -0.5415 -0.6799 0.4944 +vn -0.5311 -0.6859 0.4975 +vn -0.5513 -0.6888 0.4708 +vn -0.5402 -0.6956 0.4736 +vn -0.5408 -0.6953 0.4734 +vn -0.5211 -0.6789 0.5173 +vn -0.5219 -0.6783 0.5172 +vn -0.5227 -0.6779 0.5170 +vn -0.5309 -0.6553 0.5373 +vn -0.6489 -0.6881 0.3248 +vn -0.6491 -0.6879 0.3248 +vn -0.6249 -0.6967 0.3522 +vn -0.6378 -0.6845 0.3530 +vn -0.6151 -0.6921 0.3777 +vn -0.6276 -0.6810 0.3773 +vn -0.6060 -0.6877 0.3998 +vn -0.6182 -0.6775 0.3985 +vn -0.5978 -0.6834 0.4191 +vn -0.6096 -0.6741 0.4171 +vn -0.5906 -0.6795 0.4353 +vn -0.6019 -0.6706 0.4336 +vn -0.5497 -0.6459 0.5297 +vn -0.5562 -0.6596 0.5055 +vn -0.5658 -0.6541 0.5020 +vn -0.5658 -0.6654 0.4870 +vn -0.5656 -0.6655 0.4871 +vn -0.5772 -0.6719 0.4641 +vn -0.5644 -0.6803 0.4677 +vn -0.5097 -0.6653 0.5455 +vn -0.5215 -0.6614 0.5390 +vn -0.5333 -0.6723 0.5135 +vn -0.5331 -0.6724 0.5135 +vn -0.5542 -0.6725 0.4905 +vn -0.5412 -0.6800 0.4946 +vn -0.6205 -0.7166 0.3185 +vn -0.6176 -0.7278 0.2983 +vn -0.6211 -0.7160 0.3186 +vn -0.6214 -0.7160 0.3182 +vn -0.6119 -0.7249 0.3165 +vn -0.6081 -0.7369 0.2954 +vn -0.5408 -0.6504 0.5334 +vn -0.5452 -0.6658 0.5094 +vn -0.5560 -0.6598 0.5055 +vn -0.5541 -0.6724 0.4907 +vn -0.5539 -0.6726 0.4908 +vn -0.5648 -0.6801 0.4674 +vn -0.5645 -0.6803 0.4675 +vn -0.5628 -0.6991 0.4411 +vn -0.5771 -0.6891 0.4383 +vn -0.5693 -0.7050 0.4229 +vn -0.5843 -0.6940 0.4207 +vn -0.5766 -0.7113 0.4019 +vn -0.5921 -0.6993 0.4006 +vn -0.5847 -0.7181 0.3776 +vn -0.6007 -0.7048 0.3773 +vn -0.5935 -0.7252 0.3490 +vn -0.5927 -0.7259 0.3489 +vn -0.6033 -0.7329 0.3145 +vn -0.5995 -0.7363 0.3138 +vn -0.6111 -0.7393 0.2827 +vn -0.6113 -0.7395 0.2818 +vn -0.6172 -0.7283 0.2977 +vn -0.6213 -0.7301 0.2845 +vn -0.6261 -0.7196 0.3004 +vn -0.6304 -0.7213 0.2869 +vn -0.6306 -0.7208 0.2876 +vn -0.6284 -0.7089 0.3203 +vn -0.6210 -0.7160 0.3190 +vn -0.6178 -0.7035 0.3513 +vn -0.6105 -0.7101 0.3508 +vn -0.6152 -0.6922 0.3774 +vn -0.6010 -0.7043 0.3777 +vn -0.6062 -0.6877 0.3995 +vn -0.5924 -0.6989 0.4009 +vn -0.5979 -0.6834 0.4189 +vn -0.5845 -0.6937 0.4210 +vn -0.5903 -0.6794 0.4358 +vn -0.5906 -0.6792 0.4358 +vn -0.5763 -0.6717 0.4655 +vn -0.5880 -0.6645 0.4612 +vn 0.7348 0.6783 -0.0001 +vn 0.5747 0.6995 -0.4247 +vn 0.5162 0.6635 -0.5416 +vn 0.5649 0.6554 -0.5013 +vn 0.5491 0.6473 -0.5286 +vn 0.5461 0.6544 -0.5230 +vn 0.5564 0.6603 -0.5044 +vn 0.5324 0.6556 -0.5354 +vn 0.5430 0.6774 -0.4963 +vn 0.5386 0.6839 -0.4921 +vn 0.5218 0.6644 -0.5350 +vn 0.5366 0.6713 -0.5113 +vn 0.5362 0.6715 -0.5114 +vn 0.5447 0.6784 -0.4931 +vn 0.5444 0.6786 -0.4932 +vn 0.5643 0.6783 -0.4706 +vn 0.5541 0.6867 -0.4705 +vn 0.5653 0.6797 -0.4674 +vn 0.5659 0.6959 -0.4421 +vn 0.5757 0.6991 -0.4240 +vn 0.6196 0.7128 -0.3286 +vn 0.6060 0.7123 -0.3542 +vn 0.6421 0.7034 -0.3049 +vn 0.6529 0.6931 -0.3056 +vn 0.6526 0.6932 -0.3061 +vn 0.6532 0.6927 -0.3057 +vn 0.6380 0.6947 -0.3322 +vn 0.6325 0.7000 -0.3316 +vn 0.6317 0.6871 -0.3591 +vn 0.6222 0.6957 -0.3590 +vn 0.6221 0.6834 -0.3821 +vn 0.6227 0.6828 -0.3820 +vn 0.6048 0.6882 -0.4008 +vn 0.6136 0.6795 -0.4022 +vn 0.5853 0.6663 -0.4621 +vn 0.5847 0.6666 -0.4623 +vn 0.5892 0.6792 -0.4377 +vn 0.5642 0.6558 -0.5016 +vn 0.5655 0.6659 -0.4865 +vn 0.5463 0.6659 -0.5081 +vn 0.5464 0.6659 -0.5079 +vn 0.5468 0.6657 -0.5077 +vn 0.5234 0.6601 -0.5389 +vn 0.6053 0.6762 -0.4199 +vn 0.6042 0.6871 -0.4034 +vn 0.6044 0.6872 -0.4030 +vn 0.6038 0.6877 -0.4030 +vn 0.6005 0.7019 -0.3830 +vn 0.6123 0.6921 -0.3822 +vn 0.6095 0.7073 -0.3582 +vn 0.6215 0.6967 -0.3583 +vn 0.6194 0.7127 -0.3293 +vn 0.6180 0.7139 -0.3292 +vn 0.6183 0.7140 -0.3286 +vn 0.6234 0.7218 -0.3006 +vn 0.6033 0.7129 -0.3575 +vn 0.6012 0.7147 -0.3575 +vn 0.5998 0.7028 -0.3826 +vn 0.5910 0.7099 -0.3831 +vn 0.5917 0.6975 -0.4042 +vn 0.5924 0.6970 -0.4041 +vn 0.5841 0.6925 -0.4235 +vn 0.5965 0.6832 -0.4212 +vn 0.5963 0.6831 -0.4216 +vn 0.5979 0.6728 -0.4356 +vn 0.5738 0.6609 -0.4837 +vn 0.5657 0.6766 -0.4713 +vn 0.5658 0.6792 -0.4676 +vn 0.5760 0.6726 -0.4646 +vn 0.5779 0.6874 -0.4399 +vn 0.5773 0.6878 -0.4400 +vn 0.5775 0.6879 -0.4397 +vn 0.5737 0.7002 -0.4249 +vn 1.0000 -0.0000 0.0005 +vn -0.9192 -0.0000 -0.3938 +vn -0.9193 -0.0000 0.3936 +vn -0.9192 -0.0000 0.3939 +vn 0.9192 -0.0000 -0.3938 +vn -0.5958 0.6835 -0.4217 +vn -0.5491 0.6473 -0.5286 +vn -0.6521 0.6937 -0.3059 +vn -0.6287 0.7175 -0.2997 +vn -0.6234 0.7218 -0.3006 +vn -0.6183 0.7140 -0.3285 +vn -0.6135 0.7184 -0.3280 +vn -0.6135 0.7104 -0.3449 +vn -0.6033 0.7129 -0.3575 +vn -0.6097 0.7074 -0.3576 +vn -0.5933 0.7080 -0.3830 +vn -0.5541 0.6867 -0.4705 +vn -0.5552 0.6860 -0.4702 +vn -0.5781 0.6875 -0.4395 +vn -0.5676 0.6947 -0.4417 +vn -0.5849 0.6921 -0.4229 +vn -0.5747 0.6995 -0.4247 +vn -0.5873 0.6942 -0.4162 +vn -0.5822 0.7048 -0.4053 +vn -0.5837 0.7036 -0.4052 +vn -0.5162 0.6635 -0.5416 +vn -0.5300 0.6657 -0.5253 +vn -0.5366 0.6712 -0.5114 +vn -0.5325 0.6557 -0.5352 +vn -0.5411 0.6514 -0.5318 +vn -0.5468 0.6656 -0.5079 +vn -0.5463 0.6659 -0.5081 +vn -0.5464 0.6659 -0.5079 +vn -0.5447 0.6784 -0.4931 +vn -0.5489 0.6478 -0.5282 +vn -0.5563 0.6603 -0.5046 +vn -0.5642 0.6558 -0.5016 +vn -0.5655 0.6659 -0.4865 +vn -0.5738 0.6609 -0.4837 +vn -0.5657 0.6766 -0.4713 +vn -0.5853 0.6663 -0.4621 +vn -0.5758 0.6725 -0.4649 +vn -0.5987 0.6722 -0.4354 +vn -0.6423 0.6905 -0.3327 +vn -0.6430 0.6898 -0.3328 +vn -0.6212 0.6966 -0.3590 +vn -0.6324 0.6864 -0.3591 +vn -0.6120 0.6920 -0.3828 +vn -0.6227 0.6828 -0.3820 +vn -0.6048 0.6882 -0.4008 +vn -0.6136 0.6795 -0.4022 +vn -0.6139 0.6792 -0.4021 +vn -0.6528 0.6930 -0.3060 +vn -0.6409 0.7009 -0.3130 +vn -0.6381 0.6950 -0.3313 +vn -0.6328 0.7001 -0.3308 +vn -0.6083 0.7083 -0.3582 +vn -0.6225 0.6958 -0.3583 +vn -0.5996 0.7027 -0.3831 +vn -0.6131 0.6914 -0.3822 +vn -0.6007 0.7020 -0.3825 +vn -0.5915 0.6974 -0.4047 +vn -0.5922 0.6969 -0.4046 +vn -0.5960 0.6836 -0.4213 +vn -0.5847 0.6920 -0.4234 +vn -0.6059 0.6758 -0.4198 +vn -0.5886 0.6796 -0.4378 +vn -0.5888 0.6797 -0.4374 +vn -0.5894 0.6792 -0.4373 +vn -0.5651 0.6796 -0.4677 +vn -0.5658 0.6792 -0.4676 +vn -0.5643 0.6783 -0.4706 +vn -0.5444 0.6786 -0.4932 +vn -0.5430 0.6774 -0.4963 +vn -0.5431 0.6772 -0.4964 +vn -0.5327 0.6734 -0.5126 +vn -0.5282 0.6758 -0.5142 +vn 0.7071 0.7071 -0.0000 +vn -0.7348 0.6783 -0.0001 +vn 0.1128 0.1108 0.9874 +vn 0.1071 0.1029 0.9889 +vn 0.0952 0.1167 0.9886 +vn 0.0932 0.1112 0.9894 +vn 0.0891 0.1165 0.9892 +vn 0.0839 0.1097 0.9904 +vn 0.0886 0.1085 0.9901 +vn 0.0866 0.1131 0.9898 +vn 0.0792 0.1035 0.9915 +vn 0.0793 0.1034 0.9915 +vn 0.0793 0.1035 0.9915 +vn 0.1048 0.1048 0.9890 +vn 0.0947 0.1065 0.9898 +vn 0.0867 0.1062 0.9906 +vn 0.0941 0.0951 0.9910 +vn 0.0944 0.0948 0.9910 +vn 0.0822 0.0815 0.9933 +vn 0.0793 0.0797 0.9937 +vn 0.0813 0.0987 0.9918 +vn 0.0862 0.1024 0.9910 +vn 0.0840 0.1097 0.9904 +vn -0.7349 -0.6782 -0.0000 +s 1 +f 1//1 2//1 3//1 +f 4//1 5//1 6//1 +f 7//1 8//1 9//1 +f 10//1 11//1 12//1 +f 13//1 14//1 15//1 +f 16//1 17//1 18//1 +f 19//1 20//1 21//1 +f 22//1 23//1 24//1 +f 25//1 26//1 27//1 +f 28//1 29//1 30//1 +f 31//1 32//1 33//1 +f 34//1 35//1 36//1 +f 37//1 38//1 39//1 +f 40//1 41//1 42//1 +f 43//2 44//2 45//2 +f 46//2 47//2 48//2 +f 49//3 50//3 51//3 +f 52//4 53//4 54//4 +f 55//3 56//3 57//3 +f 58//3 59//3 60//3 +f 61//3 62//3 63//3 +f 64//3 65//3 66//3 +f 67//3 68//3 69//3 +f 70//3 71//3 72//3 +f 73//3 74//3 75//3 +f 76//3 77//3 78//3 +f 79//3 80//3 81//3 +f 82//3 83//3 84//3 +f 85//3 86//3 87//3 +f 88//3 89//3 90//3 +f 91//5 92//5 93//5 +f 94//5 95//5 96//5 +f 97//5 98//5 99//5 +f 100//5 101//5 102//5 +f 103//5 104//5 105//5 +f 106//5 107//5 108//5 +f 109//5 110//5 111//5 +f 112//5 113//5 114//5 +f 115//6 116//6 117//6 +f 118//7 119//7 120//7 +f 121//8 122//8 123//8 +f 124//9 125//9 126//9 +f 127//9 128//9 129//9 +f 130//9 131//9 132//9 +f 133//9 134//9 135//9 +f 136//9 137//9 138//9 +f 139//9 140//9 141//9 +f 142//10 143//10 144//10 +f 145//11 146//11 147//11 +f 148//12 149//12 150//12 +f 151//10 152//10 153//10 +f 154//13 155//13 156//13 +f 157//14 158//14 159//14 +f 160//15 161//15 162//15 +f 163//15 164//15 165//15 +f 166//8 167//8 168//8 +f 169//15 170//15 171//15 +f 172//15 173//15 174//15 +f 175//15 176//15 177//15 +f 178//16 179//16 180//16 +f 181//17 182//17 183//17 +f 184//18 185//18 186//18 +f 187//19 188//19 189//19 +f 190//20 191//20 192//20 +f 193//21 194//21 195//21 +f 196//22 197//22 198//22 +f 199//23 200//23 201//23 +f 202//24 203//24 204//24 +f 205//24 206//24 207//24 +f 208//24 209//24 210//24 +f 211//24 212//24 213//24 +f 214//25 215//25 216//25 +f 217//24 218//24 219//24 +f 220//24 221//24 222//24 +f 223//24 224//24 225//24 +f 226//26 227//26 228//26 +f 229//26 230//26 231//26 +f 232//27 233//27 234//27 +f 235//24 236//24 237//24 +f 238//24 239//24 240//24 +f 241//28 242//28 243//28 +f 244//29 245//29 246//29 +f 247//30 248//30 249//30 +f 250//31 251//31 252//31 +f 253//28 254//28 255//28 +f 256//32 257//32 258//32 +f 259//33 260//33 261//33 +f 262//34 263//34 264//34 +f 265//34 266//34 267//34 +f 268//34 269//34 270//34 +f 271//34 272//34 273//34 +f 274//34 275//34 276//34 +f 277//34 278//34 279//34 +f 280//34 281//34 282//34 +f 283//34 284//34 285//34 +f 286//35 287//35 288//35 +f 289//35 290//35 291//35 +f 292//35 293//35 294//35 +f 295//35 296//35 297//35 +f 298//36 299//36 300//36 +f 301//37 302//37 303//37 +f 304//38 305//38 306//38 +f 307//39 308//39 309//39 +f 310//40 311//40 312//40 +f 313//41 314//41 315//41 +f 316//42 317//42 318//42 +f 319//43 320//43 321//43 +f 322//44 323//44 324//44 +f 325//43 326//43 327//43 +f 328//45 329//45 330//45 +f 331//46 332//46 333//46 +f 334//47 335//47 336//47 +f 337//48 338//48 339//48 +f 340//49 341//49 342//49 +f 343//50 344//50 345//50 +f 346//51 347//51 348//51 +f 349//52 350//52 351//52 +f 352//53 353//53 354//53 +f 355//54 356//54 357//54 +f 358//50 359//50 360//50 +f 361//55 362//55 363//55 +f 364//56 365//56 366//56 +f 367//57 368//57 369//57 +f 370//58 371//58 372//58 +f 373//59 374//59 375//59 +f 376//60 377//60 378//60 +f 379//60 380//60 381//60 +f 382//61 383//61 384//61 +f 385//62 386//62 387//62 +f 388//38 389//38 390//38 +f 391//63 392//63 393//63 +f 394//64 395//64 396//64 +f 397//65 398//65 399//65 +f 400//65 401//65 402//65 +f 403//52 404//52 405//52 +f 406//56 407//56 408//56 +f 409//66 410//66 411//66 +f 412//66 413//66 414//66 +f 415//67 416//67 417//67 +f 418//67 419//67 420//67 +f 421//67 422//67 423//67 +f 424//68 425//68 426//68 +f 427//68 428//68 429//68 +f 430//69 431//69 432//69 +f 433//70 434//70 435//70 +f 436//71 437//71 438//71 +f 439//72 440//72 441//72 +f 442//73 443//73 444//73 +f 445//74 446//74 447//74 +f 448//75 449//75 450//75 +f 451//76 452//76 453//76 +f 454//76 455//76 456//76 +f 457//71 458//71 459//71 +f 460//77 461//77 462//77 +f 463//78 464//78 465//78 +f 466//79 467//79 468//79 +f 469//70 470//70 471//70 +f 472//80 473//80 474//80 +f 475//81 476//81 477//81 +f 478//82 479//82 480//82 +f 481//82 482//82 483//82 +f 484//49 485//49 486//49 +f 487//49 488//49 489//49 +f 490//83 491//83 492//83 +f 493//84 494//84 495//84 +f 496//85 497//85 498//85 +f 499//40 500//40 501//40 +f 502//40 503//40 504//40 +f 505//86 506//86 507//86 +f 508//87 509//87 510//87 +f 511//88 512//88 513//88 +f 514//79 515//79 516//79 +f 517//89 518//89 519//89 +f 520//80 521//80 522//80 +f 523//90 524//90 525//90 +f 526//91 527//91 528//91 +f 529//37 530//37 531//37 +f 532//92 533//92 534//92 +f 535//93 536//93 537//93 +f 538//94 539//94 540//94 +f 541//95 542//95 543//95 +f 544//96 545//96 546//96 +f 547//47 548//47 549//47 +f 550//97 551//97 552//97 +f 553//45 554//45 555//45 +f 556//98 557//98 558//98 +f 559//99 560//99 561//99 +f 562//99 563//99 564//99 +f 565//100 566//100 567//100 +f 568//101 569//101 570//101 +f 571//102 572//102 573//102 +f 574//103 575//103 576//103 +f 577//95 578//95 579//95 +f 580//104 581//104 582//104 +f 583//105 584//105 585//105 +f 586//106 587//106 588//106 +f 589//107 590//107 591//107 +f 592//71 593//71 594//71 +f 595//108 596//108 597//108 +f 598//109 599//109 600//109 +f 601//110 602//110 603//110 +f 604//110 605//110 606//110 +f 607//111 608//111 609//111 +f 610//85 611//85 612//85 +f 613//85 614//85 615//85 +f 616//42 617//42 618//42 +f 619//112 620//112 621//112 +f 622//112 623//112 624//112 +f 625//113 626//113 627//113 +f 628//86 629//86 630//86 +f 631//114 632//114 633//114 +f 634//88 635//88 636//88 +f 637//115 638//115 639//115 +f 640//89 641//89 642//89 +f 643//116 644//116 645//116 +f 646//117 647//117 648//117 +f 649//118 650//118 651//118 +f 652//118 653//118 654//118 +f 655//119 656//119 657//119 +f 658//119 659//119 660//119 +f 661//119 662//119 663//119 +f 664//119 665//119 666//119 +f 667//119 668//119 669//119 +f 670//119 671//119 672//119 +f 673//119 674//119 675//119 +f 676//119 677//119 678//119 +f 679//119 680//119 681//119 +f 682//119 683//119 684//119 +f 685//120 686//120 687//120 +f 688//120 689//120 690//120 +f 691//120 692//120 693//120 +f 694//120 695//120 696//120 +f 697//120 698//120 699//120 +f 700//120 701//120 702//120 +f 703//121 704//121 705//121 +f 706//122 707//122 708//122 +f 709//123 710//123 711//123 +f 712//124 713//124 714//124 +f 715//125 716//125 717//125 +f 718//126 719//126 720//126 +f 721//127 722//127 723//127 +f 724//128 725//128 726//128 +f 727//129 728//129 729//129 +f 730//129 731//129 732//129 +f 733//130 734//130 735//130 +f 736//131 737//131 738//131 +f 739//132 740//132 741//132 +f 742//133 743//133 744//133 +f 745//134 746//134 747//134 +f 748//127 749//127 750//127 +f 751//135 752//135 753//135 +f 754//136 755//136 756//136 +f 757//137 758//137 759//137 +f 760//138 761//138 762//138 +f 763//139 764//139 765//139 +f 766//140 767//140 768//140 +f 769//141 770//141 771//141 +f 772//142 773//142 774//142 +f 775//143 776//143 777//143 +f 778//144 779//144 780//144 +f 781//145 782//145 783//145 +f 784//146 785//146 786//146 +f 787//147 788//147 789//147 +f 790//148 791//148 792//148 +f 793//149 794//149 795//149 +f 796//149 797//149 798//149 +f 799//149 800//149 801//149 +f 802//150 803//150 804//150 +f 805//151 806//151 807//151 +f 808//152 809//152 810//152 +f 811//152 812//152 813//152 +f 814//153 815//153 816//153 +f 817//154 818//154 819//154 +f 820//155 821//155 822//155 +f 823//156 824//156 825//156 +f 826//156 827//156 828//156 +f 829//157 830//157 831//157 +f 832//158 833//158 834//158 +f 835//159 836//159 837//159 +f 838//159 839//159 840//159 +f 841//160 842//160 843//160 +f 844//161 845//161 846//161 +f 847//162 848//162 849//162 +f 850//124 851//124 852//124 +f 853//124 854//124 855//124 +f 856//163 857//163 858//163 +f 859//163 860//163 861//163 +f 862//146 863//146 864//146 +f 865//164 866//164 867//164 +f 868//165 869//165 870//165 +f 871//166 872//166 873//166 +f 874//167 875//167 876//167 +f 877//168 878//168 879//168 +f 880//168 881//168 882//168 +f 883//169 884//169 885//169 +f 886//123 887//123 888//123 +f 889//170 890//170 891//170 +f 892//171 893//171 894//171 +f 895//172 896//172 897//172 +f 898//137 899//137 900//137 +f 901//173 902//173 903//173 +f 904//174 905//174 906//174 +f 907//175 908//175 909//175 +f 910//176 911//176 912//176 +f 913//177 914//177 915//177 +f 916//178 917//178 918//178 +f 919//121 920//121 921//121 +f 922//179 923//179 924//179 +f 925//180 926//180 927//180 +f 928//181 929//181 930//181 +f 931//182 932//182 933//182 +f 934//183 935//183 936//183 +f 937//184 938//184 939//184 +f 940//185 941//185 942//185 +f 943//186 944//186 945//186 +f 946//177 947//177 948//177 +f 949//177 950//177 951//177 +f 952//187 953//187 954//187 +f 955//188 956//188 957//188 +f 958//189 959//189 960//189 +f 961//132 962//132 963//132 +f 964//190 965//190 966//190 +f 967//134 968//134 969//134 +f 970//191 971//191 972//191 +f 973//135 974//135 975//135 +f 976//192 977//192 978//192 +f 979//193 980//193 981//193 +f 982//194 983//194 984//194 +f 985//133 986//133 987//133 +f 988//173 989//173 990//173 +f 991//195 992//195 993//195 +f 994//170 995//170 996//170 +f 997//196 998//196 999//196 +f 1000//197 1001//197 1002//197 +f 1003//198 1004//198 1005//198 +f 1006//199 1007//199 1008//199 +f 1009//200 1010//200 1011//200 +f 1012//201 1013//201 1014//201 +f 1015//163 1016//163 1017//163 +f 1018//178 1019//178 1020//178 +f 1021//164 1022//164 1023//164 +f 1024//202 1025//202 1026//202 +f 1027//166 1028//166 1029//166 +f 1030//183 1031//183 1032//183 +f 1033//203 1034//203 1035//203 +f 1036//181 1037//181 1038//181 +f 1039//141 1040//141 1041//141 +f 1042//179 1043//179 1044//179 +f 1045//139 1046//139 1047//139 +f 1048//204 1049//204 1050//204 +f 1051//204 1052//204 1053//204 +f 1054//194 1055//194 1056//194 +f 1057//205 1058//205 1059//205 +f 1060//206 1061//206 1062//206 +f 1063//206 1064//206 1065//206 +f 1066//207 1067//207 1068//207 +f 1069//207 1070//207 1071//207 +f 1072//207 1073//207 1074//207 +f 1075//207 1076//207 1077//207 +f 1078//207 1079//207 1080//207 +f 1081//207 1082//207 1083//207 +f 1084//207 1085//207 1086//207 +f 1087//207 1088//207 1089//207 +f 1090//207 1091//207 1092//207 +f 1093//207 1094//207 1095//207 +f 1096//207 1097//207 1098//207 +f 1099//208 1100//208 1101//208 +f 1102//208 1103//208 1104//208 +f 1105//2 1106//2 1107//2 +f 1108//2 1109//2 1110//2 +f 1111//2 1112//2 1113//2 +f 1114//2 1115//2 1116//2 +f 1117//2 1118//2 1119//2 +f 1120//2 1121//2 1122//2 +f 1123//2 1124//2 1125//2 +f 1126//209 1127//209 1128//209 +f 1129//209 1130//209 1131//209 +f 1132//210 1133//210 1134//210 +f 1135//211 1136//211 1137//211 +f 1138//212 1139//212 1140//212 +f 1141//213 1142//213 1143//213 +f 1144//214 1145//214 1146//214 +f 1147//215 1148//215 1149//215 +f 1150//216 1151//216 1152//216 +f 1153//217 1154//217 1155//217 +f 1156//218 1157//218 1158//218 +f 1159//219 1160//219 1161//219 +f 1162//220 1163//220 1164//220 +f 1165//221 1166//221 1167//221 +f 1168//222 1169//222 1170//222 +f 1171//223 1172//223 1173//223 +f 1174//224 1175//224 1176//224 +f 1177//225 1178//225 1179//225 +f 1180//226 1181//226 1182//226 +f 1183//227 1184//227 1185//227 +f 1186//228 1187//228 1188//228 +f 1189//229 1190//229 1191//229 +f 1192//230 1193//230 1194//230 +f 1195//231 1196//231 1197//231 +f 1198//232 1199//232 1200//232 +f 1201//233 1202//233 1203//233 +f 1204//234 1205//234 1206//234 +f 1207//235 1208//235 1209//235 +f 1210//236 1211//236 1212//236 +f 1213//237 1214//237 1215//237 +f 1216//238 1217//238 1218//238 +f 1219//239 1220//239 1221//239 +f 1222//240 1223//240 1224//240 +f 1225//241 1226//241 1227//241 +f 1228//242 1229//242 1230//242 +f 1231//243 1232//243 1233//243 +f 1234//244 1235//244 1236//244 +f 1237//245 1238//245 1239//245 +f 1240//246 1241//246 1242//246 +f 1243//247 1244//247 1245//247 +f 1246//248 1247//248 1248//248 +f 1249//249 1250//249 1251//249 +f 1252//250 1253//250 1254//250 +f 1255//251 1256//251 1257//251 +f 1258//252 1259//252 1260//252 +f 1261//253 1262//253 1263//253 +f 1264//254 1265//254 1266//254 +f 1267//255 1268//255 1269//255 +f 1270//256 1271//256 1272//256 +f 1273//257 1274//257 1275//257 +f 1276//258 1277//258 1278//258 +f 1279//259 1280//259 1281//259 +f 1282//260 1283//260 1284//260 +f 1285//261 1286//261 1287//261 +f 1288//262 1289//262 1290//262 +f 1291//263 1292//263 1293//263 +f 1294//264 1295//264 1296//264 +f 1297//265 1298//265 1299//265 +f 1300//266 1301//266 1302//266 +f 1303//267 1304//267 1305//267 +f 1306//268 1307//268 1308//268 +f 1309//269 1310//269 1311//269 +f 1312//270 1313//270 1314//270 +f 1315//271 1316//271 1317//271 +f 1318//272 1319//272 1320//272 +f 1321//273 1322//273 1323//273 +f 1324//274 1325//274 1326//274 +f 1327//275 1328//275 1329//275 +f 1330//276 1331//276 1332//276 +f 1333//277 1334//277 1335//277 +f 1336//278 1337//278 1338//278 +f 1339//279 1340//279 1341//279 +f 1342//280 1343//280 1344//280 +f 1345//281 1346//281 1347//281 +f 1348//282 1349//282 1350//282 +f 1351//283 1352//283 1353//283 +f 1354//284 1355//284 1356//284 +f 1357//285 1358//285 1359//285 +f 1360//286 1361//286 1362//286 +f 1363//287 1364//287 1365//287 +f 1366//288 1367//288 1368//288 +f 1369//289 1370//289 1371//289 +f 1372//290 1373//290 1374//290 +f 1375//291 1376//291 1377//291 +f 1378//292 1379//292 1380//292 +f 1381//293 1382//293 1383//293 +f 1384//294 1385//294 1386//294 +f 1387//295 1388//295 1389//295 +f 1390//296 1391//296 1392//296 +f 1393//297 1394//297 1395//297 +f 1396//298 1397//298 1398//298 +f 1399//299 1400//299 1401//299 +f 1402//300 1403//300 1404//300 +f 1405//301 1406//301 1407//301 +f 1408//302 1409//302 1410//302 +f 1411//303 1412//303 1413//303 +f 1414//304 1415//304 1416//304 +f 1417//305 1418//305 1419//305 +f 1420//306 1421//306 1422//306 +f 1423//307 1424//307 1425//307 +f 1426//308 1427//308 1428//308 +f 1429//309 1430//309 1431//309 +f 1432//310 1433//310 1434//310 +f 1435//311 1436//311 1437//311 +f 1438//311 1439//311 1440//311 +f 1441//311 1442//311 1443//311 +f 1444//311 1445//311 1446//311 +f 1447//311 1448//311 1449//311 +f 1450//311 1451//311 1452//311 +f 1453//311 1454//311 1455//311 +f 1456//311 1457//311 1458//311 +f 1459//311 1460//311 1461//311 +f 1462//311 1463//311 1464//311 +f 1465//311 1466//311 1467//311 +f 1468//312 1469//312 1470//312 +f 1471//312 1472//312 1473//312 +f 1474//313 1475//313 1476//313 +f 1477//313 1478//313 1479//313 +f 1480//313 1481//313 1482//313 +f 1483//313 1484//313 1485//313 +f 1486//314 1487//314 1488//314 +f 1489//314 1490//314 1491//314 +f 1492//314 1493//314 1494//314 +f 1495//314 1496//314 1497//314 +f 1498//315 1499//315 1500//315 +f 1501//314 1502//314 1503//314 +f 1504//314 1505//314 1506//314 +f 1507//314 1508//314 1509//314 +f 1510//316 1511//316 1512//316 +f 1513//317 1514//317 1515//317 +f 1516//318 1517//318 1518//318 +f 1519//318 1520//318 1521//318 +f 1522//319 1523//319 1524//319 +f 1525//320 1526//320 1527//320 +f 1528//320 1529//320 1530//320 +f 1531//320 1532//320 1533//320 +f 1534//320 1535//320 1536//320 +f 1537//320 1538//320 1539//320 +f 1540//321 1541//321 1542//321 +f 1543//316 1544//316 1545//316 +f 1546//316 1547//316 1548//316 +f 1549//316 1550//316 1551//316 +f 1552//322 1553//322 1554//322 +f 1555//323 1556//323 1557//323 +f 1558//324 1559//324 1560//324 +f 1561//325 1562//325 1563//325 +f 1564//326 1565//326 1566//326 +f 1567//327 1568//327 1569//327 +f 1570//328 1571//328 1572//328 +f 1573//329 1574//329 1575//329 +f 1576//329 1577//329 1578//329 +f 1579//329 1580//329 1581//329 +f 1582//312 1583//312 1584//312 +f 1585//312 1586//312 1587//312 +f 1588//312 1589//312 1590//312 +f 1591//330 1592//330 1593//330 +f 1594//331 1595//331 1596//331 +f 1597//332 1598//332 1599//332 +f 1600//333 1601//333 1602//333 +f 1603//334 1604//334 1605//334 +f 1606//335 1607//335 1608//335 +f 1609//336 1610//336 1611//336 +f 1612//337 1613//337 1614//337 +f 1615//338 1616//338 1617//338 +f 1618//339 1619//339 1620//339 +f 1621//340 1622//340 1623//340 +f 1624//341 1625//341 1626//341 +f 1627//342 1628//342 1629//342 +f 1630//343 1631//343 1632//343 +f 1633//344 1634//344 1635//344 +f 1636//345 1637//345 1638//345 +f 1639//346 1640//346 1641//346 +f 1642//347 1643//347 1644//347 +f 1645//348 1646//348 1647//348 +f 1648//349 1649//349 1650//349 +f 1651//350 1652//350 1653//350 +f 1654//351 1655//351 1656//351 +f 1657//352 1658//352 1659//352 +f 1660//353 1661//353 1662//353 +f 1663//354 1664//354 1665//354 +f 1666//355 1667//355 1668//355 +f 1669//356 1670//356 1671//356 +f 1672//357 1673//357 1674//357 +f 1675//358 1676//358 1677//358 +f 1678//359 1679//359 1680//359 +f 1681//360 1682//360 1683//360 +f 1684//361 1685//361 1686//361 +f 1687//362 1688//362 1689//362 +f 1690//363 1691//363 1692//363 +f 1693//364 1694//364 1695//364 +f 1696//365 1697//365 1698//365 +f 1699//366 1700//366 1701//366 +f 1702//367 1703//367 1704//367 +f 1705//368 1706//368 1707//368 +f 1708//369 1709//369 1710//369 +f 1711//370 1712//370 1713//370 +f 1714//371 1715//371 1716//371 +f 1717//372 1718//372 1719//372 +f 1720//373 1721//373 1722//373 +f 1723//374 1724//374 1725//374 +f 1726//375 1727//375 1728//375 +f 1729//376 1730//376 1731//376 +f 1732//377 1733//377 1734//377 +f 1735//378 1736//378 1737//378 +f 1738//379 1739//379 1740//379 +f 1741//380 1742//380 1743//380 +f 1744//381 1745//381 1746//381 +f 1747//382 1748//382 1749//382 +f 1750//383 1751//383 1752//383 +f 1753//384 1754//384 1755//384 +f 1756//385 1757//385 1758//385 +f 1759//386 1760//386 1761//386 +f 1762//387 1763//387 1764//387 +f 1765//388 1766//388 1767//388 +f 1768//389 1769//389 1770//389 +f 1771//390 1772//390 1773//390 +f 1774//391 1775//391 1776//391 +f 1777//392 1778//392 1779//392 +f 1780//393 1781//393 1782//393 +f 1783//394 1784//394 1785//394 +f 1786//395 1787//395 1788//395 +f 1789//396 1790//396 1791//396 +f 1792//397 1793//397 1794//397 +f 1795//398 1796//398 1797//398 +f 1798//399 1799//399 1800//399 +f 1801//400 1802//400 1803//400 +f 1804//401 1805//401 1806//401 +f 1807//402 1808//402 1809//402 +f 1810//403 1811//403 1812//403 +f 1813//404 1814//404 1815//404 +f 1816//405 1817//405 1818//405 +f 1819//406 1820//406 1821//406 +f 1822//407 1823//407 1824//407 +f 1825//408 1826//408 1827//408 +f 1828//409 1829//409 1830//409 +f 1831//410 1832//410 1833//410 +f 1834//411 1835//411 1836//411 +f 1837//412 1838//412 1839//412 +f 1840//413 1841//413 1842//413 +f 1843//414 1844//414 1845//414 +f 1846//415 1847//415 1848//415 +f 1849//416 1850//416 1851//416 +f 1852//417 1853//417 1854//417 +f 1855//418 1856//418 1857//418 +f 1858//419 1859//419 1860//419 +f 1861//420 1862//420 1863//420 +f 1864//421 1865//421 1866//421 +f 1867//422 1868//422 1869//422 +f 1870//423 1871//423 1872//423 +f 1873//424 1874//424 1875//424 +f 1876//425 1877//425 1878//425 +f 1879//426 1880//426 1881//426 +f 1882//427 1883//427 1884//427 +f 1885//428 1886//428 1887//428 +f 1888//429 1889//429 1890//429 +f 1891//430 1892//430 1893//430 +f 1894//209 1895//209 1896//209 +f 1897//209 1898//209 1899//209 +f 1900//209 1901//209 1902//209 +f 1903//312 1904//312 1905//312 +f 1906//312 1907//312 1908//312 +f 1909//312 1910//312 1911//312 +f 1912//431 1913//431 1914//431 +f 1915//431 1916//431 1917//431 +f 1918//431 1919//431 1920//431 +f 1921//431 1922//431 1923//431 +f 1924//432 1925//432 1926//432 +f 1927//432 1928//432 1929//432 +f 1930//432 1931//432 1932//432 +f 1933//432 1934//432 1935//432 +f 1936//432 1937//432 1938//432 +f 1939//432 1940//432 1941//432 +f 1942//432 1943//432 1944//432 +f 1945//432 1946//432 1947//432 +f 1948//432 1949//432 1950//432 +f 1951//432 1952//432 1953//432 +f 1954//432 1955//432 1956//432 +f 1957//432 1958//432 1959//432 +f 1960//432 1961//432 1962//432 +f 1963//432 1964//432 1965//432 +f 1966//432 1967//432 1968//432 +f 1969//432 1970//432 1971//432 +f 1972//432 1973//432 1974//432 +f 1975//432 1976//432 1977//432 +f 1978//432 1979//432 1980//432 +f 1981//432 1982//432 1983//432 +f 1984//433 1985//433 1986//433 +f 1987//433 1988//433 1989//433 +f 1990//208 1991//208 1992//208 +f 1993//208 1994//208 1995//208 +f 1996//208 1997//208 1998//208 +f 1999//208 2000//208 2001//208 +f 2002//208 2003//208 2004//208 +f 2005//208 2006//208 2007//208 +f 2008//208 2009//208 2010//208 +f 2011//208 2012//208 2013//208 +f 2014//208 2015//208 2016//208 +f 2017//208 2018//208 2019//208 +f 2020//208 2021//208 2022//208 +f 2023//208 2024//208 2025//208 +f 2026//208 2027//208 2028//208 +f 2029//208 2030//208 2031//208 +f 2032//2 2033//2 2034//2 +f 2035//2 2036//2 2037//2 +f 2038//2 2039//2 2040//2 +f 2041//2 2042//2 2043//2 +f 2044//2 2045//2 2046//2 +f 2047//2 2048//2 2049//2 +f 2050//2 2051//2 2052//2 +f 2053//2 2054//2 2055//2 +f 2056//2 2057//2 2058//2 +f 2059//2 2060//2 2061//2 +f 2062//2 2063//2 2064//2 +f 2065//2 2066//2 2067//2 +f 2068//2 2069//2 2070//2 +f 2071//434 2072//434 2073//434 +f 2074//434 2075//434 2076//434 +f 2077//434 2078//434 2079//434 +f 2080//434 2081//434 2082//434 +f 2083//434 2084//434 2085//434 +f 2086//434 2087//434 2088//434 +f 2089//434 2090//434 2091//434 +f 2092//434 2093//434 2094//434 +f 2095//435 2096//435 2097//435 +f 2098//435 2099//435 2100//435 +f 2101//435 2102//435 2103//435 +f 2104//435 2105//435 2106//435 +f 2107//435 2108//435 2109//435 +f 2110//435 2111//435 2112//435 +f 2113//2 2114//2 2115//2 +f 2116//2 2117//2 2118//2 +f 2119//436 2120//436 2121//436 +f 2122//436 2123//436 2124//436 +f 2125//436 2126//436 2127//436 +f 2128//436 2129//436 2130//436 +f 2131//436 2132//436 2133//436 +f 2134//436 2135//436 2136//436 +f 2137//436 2138//436 2139//436 +f 2140//436 2141//436 2142//436 +f 2143//436 2144//436 2145//436 +f 2146//436 2147//436 2148//436 +f 2149//209 2150//209 2151//209 +f 2152//209 2153//209 2154//209 +f 2155//437 2156//437 2157//437 +f 2158//438 2159//438 2160//438 +f 2161//438 2162//438 2163//438 +f 2164//438 2165//438 2166//438 +f 2167//438 2168//438 2169//438 +f 2170//438 2171//438 2172//438 +f 2173//438 2174//438 2175//438 +f 2176//439 2177//439 2178//439 +f 2179//439 2180//439 2181//439 +f 2182//439 2183//439 2184//439 +f 2185//440 2186//440 2187//440 +f 2188//440 2189//440 2190//440 +f 2191//440 2192//440 2193//440 +f 2194//440 2195//440 2196//440 +f 2197//441 2198//441 2199//441 +f 2200//441 2201//441 2202//441 +f 2203//440 2204//440 2205//440 +f 2206//440 2207//440 2208//440 +f 2209//442 2210//442 2211//442 +f 2212//443 2213//443 2214//443 +f 2215//444 2216//444 2217//444 +f 2218//445 2219//445 2220//445 +f 2221//446 2222//446 2223//446 +f 2224//446 2225//446 2226//446 +f 2227//447 2228//447 2229//447 +f 2230//447 2231//447 2232//447 +f 2233//447 2234//447 2235//447 +f 2236//448 2237//448 2238//448 +f 2239//448 2240//448 2241//448 +f 2242//448 2243//448 2244//448 +f 2245//448 2246//448 2247//448 +f 2248//448 2249//448 2250//448 +f 2251//448 2252//448 2253//448 +f 2254//449 2255//449 2256//449 +f 2257//449 2258//449 2259//449 +f 2260//448 2261//448 2262//448 +f 2263//450 2264//450 2265//450 +f 2266//451 2267//451 2268//451 +f 2269//451 2270//451 2271//451 +f 2272//448 2273//448 2274//448 +f 2275//452 2276//452 2277//452 +f 2278//453 2279//453 2280//453 +f 2281//454 2282//454 2283//454 +f 2284//455 2285//455 2286//455 +f 2287//456 2288//456 2289//456 +f 2290//457 2291//457 2292//457 +f 2293//434 2294//434 2295//434 +f 2296//434 2297//434 2298//434 +f 2299//434 2300//434 2301//434 +f 2302//434 2303//434 2304//434 +f 2305//458 2306//458 2307//458 +f 2308//434 2309//434 2310//434 +f 2311//434 2312//434 2313//434 +f 2314//434 2315//434 2316//434 +f 2317//119 2318//119 2319//119 +f 2320//119 2321//119 2322//119 +f 2323//209 2324//209 2325//209 +f 2326//209 2327//209 2328//209 +f 2329//209 2330//209 2331//209 +f 2332//459 2333//459 2334//459 +f 2335//460 2336//460 2337//460 +f 2338//461 2339//461 2340//461 +f 2341//462 2342//462 2343//462 +f 2344//463 2345//463 2346//463 +f 2347//464 2348//464 2349//464 +f 2350//465 2351//465 2352//465 +f 2353//466 2354//466 2355//466 +f 2356//467 2357//467 2358//467 +f 2359//468 2360//468 2361//468 +f 2362//469 2363//469 2364//469 +f 2365//470 2366//470 2367//470 +f 2368//471 2369//471 2370//471 +f 2371//472 2372//472 2373//472 +f 2374//473 2375//473 2376//473 +f 2377//474 2378//474 2379//474 +f 2380//475 2381//475 2382//475 +f 2383//476 2384//476 2385//476 +f 2386//477 2387//477 2388//477 +f 2389//478 2390//478 2391//478 +f 2392//479 2393//479 2394//479 +f 2395//480 2396//480 2397//480 +f 2398//481 2399//481 2400//481 +f 2401//482 2402//482 2403//482 +f 2404//483 2405//483 2406//483 +f 2407//484 2408//484 2409//484 +f 2410//485 2411//485 2412//485 +f 2413//486 2414//486 2415//486 +f 2416//487 2417//487 2418//487 +f 2419//488 2420//488 2421//488 +f 2422//489 2423//489 2424//489 +f 2425//490 2426//490 2427//490 +f 2428//491 2429//491 2430//491 +f 2431//492 2432//492 2433//492 +f 2434//493 2435//493 2436//493 +f 2437//494 2438//494 2439//494 +f 2440//495 2441//495 2442//495 +f 2443//496 2444//496 2445//496 +f 2446//497 2447//497 2448//497 +f 2449//498 2450//498 2451//498 +f 2452//499 2453//499 2454//499 +f 2455//500 2456//500 2457//500 +f 2458//501 2459//501 2460//501 +f 2461//502 2462//502 2463//502 +f 2464//503 2465//503 2466//503 +f 2467//504 2468//504 2469//504 +f 2470//505 2471//505 2472//505 +f 2473//506 2474//506 2475//506 +f 2476//507 2477//507 2478//507 +f 2479//508 2480//508 2481//508 +f 2482//509 2483//509 2484//509 +f 2485//510 2486//510 2487//510 +f 2488//511 2489//511 2490//511 +f 2491//512 2492//512 2493//512 +f 2494//513 2495//513 2496//513 +f 2497//514 2498//514 2499//514 +f 2500//515 2501//515 2502//515 +f 2503//516 2504//516 2505//516 +f 2506//517 2507//517 2508//517 +f 2509//518 2510//518 2511//518 +f 2512//519 2513//519 2514//519 +f 2515//520 2516//520 2517//520 +f 2518//521 2519//521 2520//521 +f 2521//522 2522//522 2523//522 +f 2524//523 2525//523 2526//523 +f 2527//524 2528//524 2529//524 +f 2530//525 2531//525 2532//525 +f 2533//526 2534//526 2535//526 +f 2536//527 2537//527 2538//527 +f 2539//528 2540//528 2541//528 +f 2542//529 2543//529 2544//529 +f 2545//530 2546//530 2547//530 +f 2548//531 2549//531 2550//531 +f 2551//532 2552//532 2553//532 +f 2554//533 2555//533 2556//533 +f 2557//534 2558//534 2559//534 +f 2560//535 2561//535 2562//535 +f 2563//536 2564//536 2565//536 +f 2566//537 2567//537 2568//537 +f 2569//538 2570//538 2571//538 +f 2572//539 2573//539 2574//539 +f 2575//540 2576//540 2577//540 +f 2578//541 2579//541 2580//541 +f 2581//542 2582//542 2583//542 +f 2584//543 2585//543 2586//543 +f 2587//544 2588//544 2589//544 +f 2590//545 2591//545 2592//545 +f 2593//546 2594//546 2595//546 +f 2596//547 2597//547 2598//547 +f 2599//548 2600//548 2601//548 +f 2602//549 2603//549 2604//549 +f 2605//550 2606//550 2607//550 +f 2608//551 2609//551 2610//551 +f 2611//552 2612//552 2613//552 +f 2614//553 2615//553 2616//553 +f 2617//554 2618//554 2619//554 +f 2620//555 2621//555 2622//555 +f 2623//556 2624//556 2625//556 +f 2626//557 2627//557 2628//557 +f 2629//558 2630//558 2631//558 +f 2632//559 2633//559 2634//559 +f 2635//312 2636//312 2637//312 +f 2638//312 2639//312 2640//312 +f 2641//560 2642//560 2643//560 +f 2644//561 2645//561 2646//561 +f 2647//561 2648//561 2649//561 +f 2650//207 2651//207 2652//207 +f 2653//207 2654//207 2655//207 +f 2656//207 2657//207 2658//207 +f 2659//207 2660//207 2661//207 +f 2662//207 2663//207 2664//207 +f 2665//207 2666//207 2667//207 +f 2668//207 2669//207 2670//207 +f 2671//207 2672//207 2673//207 +f 2674//207 2675//207 2676//207 +f 2677//207 2678//207 2679//207 +f 2680//207 2681//207 2682//207 +f 2683//207 2684//207 2685//207 +f 2686//207 2687//207 2688//207 +f 2689//207 2690//207 2691//207 +f 2692//562 2693//562 2694//562 +f 2695//563 2696//563 2697//563 +f 2698//564 2699//564 2700//564 +f 2701//565 2702//565 2703//565 +f 2704//565 2705//565 2706//565 +f 2707//565 2708//565 2709//565 +f 2710//565 2711//565 2712//565 +f 2713//564 2714//564 2715//564 +f 2716//566 2717//566 2718//566 +f 2719//565 2720//565 2721//565 +f 2722//565 2723//565 2724//565 +f 2725//565 2726//565 2727//565 +f 2728//565 2729//565 2730//565 +f 2731//565 2732//565 2733//565 +f 2734//567 2735//567 2736//567 +f 2737//567 2738//567 2739//567 +f 2740//568 2741//568 2742//568 +f 2743//569 2744//569 2745//569 +f 2746//569 2747//569 2748//569 +f 2749//570 2750//570 2751//570 +f 2752//571 2753//571 2754//571 +f 2755//572 2756//572 2757//572 +f 2758//573 2759//573 2760//573 +f 2761//574 2762//574 2763//574 +f 2764//575 2765//575 2766//575 +f 2767//576 2768//576 2769//576 +f 2770//577 2771//577 2772//577 +f 2773//578 2774//578 2775//578 +f 2776//579 2777//579 2778//579 +f 2779//580 2780//580 2781//580 +f 2782//561 2783//561 2784//561 +f 2785//561 2786//561 2787//561 +f 2788//120 2789//120 2790//120 +f 2791//120 2792//120 2793//120 +f 2794//120 2795//120 2796//120 +f 2797//120 2798//120 2799//120 +f 2800//120 2801//120 2802//120 +f 2803//120 2804//120 2805//120 +f 2806//120 2807//120 2808//120 +f 2809//120 2810//120 2811//120 +f 2812//120 2813//120 2814//120 +f 2815//581 2816//581 2817//581 +f 2818//120 2819//120 2820//120 +f 2821//120 2822//120 2823//120 +f 2824//120 2825//120 2826//120 +f 2827//209 2828//209 2829//209 +f 2830//209 2831//209 2832//209 +f 2833//439 2834//439 2835//439 +f 2836//439 2837//439 2838//439 +f 2839//439 2840//439 2841//439 +f 2842//312 2843//312 2844//312 +f 2845//312 2846//312 2847//312 +f 2848//312 2849//312 2850//312 +f 2851//312 2852//312 2853//312 +f 2854//433 2855//433 2856//433 +f 2857//433 2858//433 2859//433 +f 2860//433 2861//433 2862//433 +f 2863//433 2864//433 2865//433 +f 2866//433 2867//433 2868//433 +f 2869//433 2870//433 2871//433 +f 2872//208 2873//208 2874//208 +f 2875//208 2876//208 2877//208 +f 2878//582 2879//582 2880//582 +f 2881//583 2882//583 2883//583 +f 2884//584 2885//584 2886//584 +f 2887//585 2888//585 2889//585 +f 2890//586 2891//586 2892//586 +f 2893//587 2894//587 2895//587 +f 2896//588 2897//588 2898//588 +f 2899//589 2900//589 2901//589 +f 2902//590 2903//590 2904//590 +f 2905//591 2906//591 2907//591 +f 2908//592 2909//592 2910//592 +f 2911//593 2912//593 2913//593 +f 2914//594 2915//594 2916//594 +f 2917//595 2918//595 2919//595 +f 2920//596 2921//596 2922//596 +f 2923//597 2924//597 2925//597 +f 2926//598 2927//598 2928//598 +f 2929//599 2930//599 2931//599 +f 2932//600 2933//600 2934//600 +f 2935//601 2936//601 2937//601 +f 2938//602 2939//602 2940//602 +f 2941//603 2942//603 2943//603 +f 2944//604 2945//604 2946//604 +f 2947//605 2948//605 2949//605 +f 2950//606 2951//606 2952//606 +f 2953//607 2954//607 2955//607 +f 2956//608 2957//608 2958//608 +f 2959//609 2960//609 2961//609 +f 2962//610 2963//610 2964//610 +f 2965//611 2966//611 2967//611 +f 2968//612 2969//612 2970//612 +f 2971//613 2972//613 2973//613 +f 2974//614 2975//614 2976//614 +f 2977//615 2978//615 2979//615 +f 2980//616 2981//616 2982//616 +f 2983//617 2984//617 2985//617 +f 2986//618 2987//618 2988//618 +f 2989//619 2990//619 2991//619 +f 2992//620 2993//620 2994//620 +f 2995//621 2996//621 2997//621 +f 2998//622 2999//622 3000//622 +f 3001//623 3002//623 3003//623 +f 3004//624 3005//624 3006//624 +f 3007//625 3008//625 3009//625 +f 3010//626 3011//626 3012//626 +f 3013//627 3014//627 3015//627 +f 3016//628 3017//628 3018//628 +f 3019//629 3020//629 3021//629 +f 3022//630 3023//630 3024//630 +f 3025//631 3026//631 3027//631 +f 3028//632 3029//632 3030//632 +f 3031//633 3032//633 3033//633 +f 3034//634 3035//634 3036//634 +f 3037//635 3038//635 3039//635 +f 3040//636 3041//636 3042//636 +f 3043//637 3044//637 3045//637 +f 3046//638 3047//638 3048//638 +f 3049//639 3050//639 3051//639 +f 3052//640 3053//640 3054//640 +f 3055//641 3056//641 3057//641 +f 3058//642 3059//642 3060//642 +f 3061//643 3062//643 3063//643 +f 3064//644 3065//644 3066//644 +f 3067//645 3068//645 3069//645 +f 3070//646 3071//646 3072//646 +f 3073//647 3074//647 3075//647 +f 3076//648 3077//648 3078//648 +f 3079//649 3080//649 3081//649 +f 3082//650 3083//650 3084//650 +f 3085//651 3086//651 3087//651 +f 3088//652 3089//652 3090//652 +f 3091//653 3092//653 3093//653 +f 3094//654 3095//654 3096//654 +f 3097//655 3098//655 3099//655 +f 3100//656 3101//656 3102//656 +f 3103//657 3104//657 3105//657 +f 3106//658 3107//658 3108//658 +f 3109//659 3110//659 3111//659 +f 3112//660 3113//660 3114//660 +f 3115//661 3116//661 3117//661 +f 3118//662 3119//662 3120//662 +f 3121//663 3122//663 3123//663 +f 3124//664 3125//664 3126//664 +f 3127//665 3128//665 3129//665 +f 3130//666 3131//666 3132//666 +f 3133//667 3134//667 3135//667 +f 3136//668 3137//668 3138//668 +f 3139//669 3140//669 3141//669 +f 3142//670 3143//670 3144//670 +f 3145//671 3146//671 3147//671 +f 3148//672 3149//672 3150//672 +f 3151//673 3152//673 3153//673 +f 3154//674 3155//674 3156//674 +f 3157//675 3158//675 3159//675 +f 3160//676 3161//676 3162//676 +f 3163//677 3164//677 3165//677 +f 3166//678 3167//678 3168//678 +f 3169//679 3170//679 3171//679 +f 3172//680 3173//680 3174//680 +f 3175//681 3176//681 3177//681 +f 3178//682 3179//682 3180//682 +f 3181//435 3182//435 3183//435 +f 3184//435 3185//435 3186//435 +f 3187//435 3188//435 3189//435 +f 3190//435 3191//435 3192//435 +f 3193//435 3194//435 3195//435 +f 3196//435 3197//435 3198//435 +f 3199//435 3200//435 3201//435 +f 3202//435 3203//435 3204//435 +f 3205//435 3206//435 3207//435 +f 3208//435 3209//435 3210//435 +f 3211//435 3212//435 3213//435 +f 3214//435 3215//435 3216//435 +f 3217//206 3218//206 3219//206 +f 3220//206 3221//206 3222//206 +f 3223//206 3224//206 3225//206 +f 3226//206 3227//206 3228//206 +f 3229//206 3230//206 3231//206 +f 3232//206 3233//206 3234//206 +f 3235//3 3236//3 3237//3 +f 3238//3 3239//3 3240//3 +f 3241//3 3242//3 3243//3 +f 3244//3 3245//3 3246//3 +f 3247//3 3248//3 3249//3 +f 3250//3 3251//3 3252//3 +f 3253//683 3254//683 3255//683 +f 3256//3 3257//3 3258//3 +f 3259//3 3260//3 3261//3 +f 3262//3 3263//3 3264//3 +f 3265//3 3266//3 3267//3 +f 3268//3 3269//3 3270//3 +f 3271//3 3272//3 3273//3 +f 3274//3 3275//3 3276//3 +f 3277//3 3278//3 3279//3 +f 3280//3 3281//3 3282//3 +f 3283//3 3284//3 3285//3 +f 3286//2 3287//2 3288//2 +f 3289//2 3290//2 3291//2 +f 3292//2 3293//2 3294//2 +f 3295//2 3296//2 3297//2 +f 3298//2 3299//2 3300//2 +f 3301//2 3302//2 3303//2 +f 3304//432 3305//432 3306//432 +f 3307//432 3308//432 3309//432 +f 3310//684 3311//684 3312//684 +f 3313//685 3314//685 3315//685 +f 3316//686 3317//686 3318//686 +f 3319//687 3320//687 3321//687 +f 3322//688 3323//688 3324//688 +f 3325//689 3326//689 3327//689 +f 3328//690 3329//690 3330//690 +f 3331//691 3332//691 3333//691 +f 3334//692 3335//692 3336//692 +f 3337//693 3338//693 3339//693 +f 3340//694 3341//694 3342//694 +f 3343//695 3344//695 3345//695 +f 3346//696 3347//696 3348//696 +f 3349//697 3350//697 3351//697 +f 3352//698 3353//698 3354//698 +f 3355//699 3356//699 3357//699 +f 3358//700 3359//700 3360//700 +f 3361//701 3362//701 3363//701 +f 3364//702 3365//702 3366//702 +f 3367//703 3368//703 3369//703 +f 3370//704 3371//704 3372//704 +f 3373//705 3374//705 3375//705 +f 3376//706 3377//706 3378//706 +f 3379//707 3380//707 3381//707 +f 3382//708 3383//708 3384//708 +f 3385//709 3386//709 3387//709 +f 3388//710 3389//710 3390//710 +f 3391//711 3392//711 3393//711 +f 3394//712 3395//712 3396//712 +f 3397//713 3398//713 3399//713 +f 3400//714 3401//714 3402//714 +f 3403//715 3404//715 3405//715 +f 3406//716 3407//716 3408//716 +f 3409//717 3410//717 3411//717 +f 3412//718 3413//718 3414//718 +f 3415//719 3416//719 3417//719 +f 3418//720 3419//720 3420//720 +f 3421//721 3422//721 3423//721 +f 3424//722 3425//722 3426//722 +f 3427//723 3428//723 3429//723 +f 3430//724 3431//724 3432//724 +f 3433//725 3434//725 3435//725 +f 3436//726 3437//726 3438//726 +f 3439//727 3440//727 3441//727 +f 3442//728 3443//728 3444//728 +f 3445//729 3446//729 3447//729 +f 3448//730 3449//730 3450//730 +f 3451//731 3452//731 3453//731 +f 3454//732 3455//732 3456//732 +f 3457//733 3458//733 3459//733 +f 3460//734 3461//734 3462//734 +f 3463//735 3464//735 3465//735 +f 3466//736 3467//736 3468//736 +f 3469//737 3470//737 3471//737 +f 3472//738 3473//738 3474//738 +f 3475//739 3476//739 3477//739 +f 3478//740 3479//740 3480//740 +f 3481//741 3482//741 3483//741 +f 3484//742 3485//742 3486//742 +f 3487//743 3488//743 3489//743 +f 3490//744 3491//744 3492//744 +f 3493//745 3494//745 3495//745 +f 3496//746 3497//746 3498//746 +f 3499//747 3500//747 3501//747 +f 3502//748 3503//748 3504//748 +f 3505//749 3506//749 3507//749 +f 3508//750 3509//750 3510//750 +f 3511//751 3512//751 3513//751 +f 3514//752 3515//752 3516//752 +f 3517//753 3518//753 3519//753 +f 3520//754 3521//754 3522//754 +f 3523//755 3524//755 3525//755 +f 3526//438 3527//438 3528//438 +f 3529//438 3530//438 3531//438 +f 3532//438 3533//438 3534//438 +f 3535//438 3536//438 3537//438 +f 3538//438 3539//438 3540//438 +f 3541//438 3542//438 3543//438 +f 3544//438 3545//438 3546//438 +f 3547//438 3548//438 3549//438 +f 3550//438 3551//438 3552//438 +f 3553//438 3554//438 3555//438 +f 3556//438 3557//438 3558//438 +f 3559//438 3560//438 3561//438 +f 3562//438 3563//438 3564//438 +f 3565//35 3566//35 3567//35 +f 3568//35 3569//35 3570//35 +f 3571//35 3572//35 3573//35 +f 3574//35 3575//35 3576//35 +f 3577//35 3578//35 3579//35 +f 3580//35 3581//35 3582//35 +f 3583//313 3584//313 3585//313 +f 3586//313 3587//313 3588//313 +f 3589//313 3590//313 3591//313 +f 3592//313 3593//313 3594//313 +f 3595//431 3596//431 3597//431 +f 3598//431 3599//431 3600//431 +f 3601//431 3602//431 3603//431 +f 3604//431 3605//431 3606//431 +f 3607//209 3608//209 3609//209 +f 3610//209 3611//209 3612//209 +f 3613//756 3614//756 3615//756 +f 3616//757 3617//757 3618//757 +f 3619//314 3620//314 3621//314 +f 3622//314 3623//314 3624//314 +f 3625//314 3626//314 3627//314 +f 3628//119 3629//119 3630//119 +f 3631//119 3632//119 3633//119 +f 3634//119 3635//119 3636//119 +f 3637//119 3638//119 3639//119 +f 3640//119 3641//119 3642//119 +f 3643//119 3644//119 3645//119 +f 3646//119 3647//119 3648//119 +f 3649//2 3650//2 3651//2 +f 3652//2 3653//2 3654//2 +f 3655//2 3656//2 3657//2 +f 3658//2 3659//2 3660//2 +f 3661//2 3662//2 3663//2 +f 3664//2 3665//2 3666//2 +f 3667//2 3668//2 3669//2 +f 3670//2 3671//2 3672//2 +f 3673//2 3674//2 3675//2 +f 3676//2 3677//2 3678//2 +f 3679//432 3680//432 3681//432 +f 3682//432 3683//432 3684//432 +f 3685//432 3686//432 3687//432 +f 3688//432 3689//432 3690//432 +f 3691//432 3692//432 3693//432 +f 3694//432 3695//432 3696//432 +f 3697//432 3698//432 3699//432 +f 3700//432 3701//432 3702//432 +f 3703//432 3704//432 3705//432 +f 3706//432 3707//432 3708//432 +f 3709//432 3710//432 3711//432 +f 3712//432 3713//432 3714//432 +f 3715//432 3716//432 3717//432 +f 3718//432 3719//432 3720//432 +f 3721//432 3722//432 3723//432 +f 3724//432 3725//432 3726//432 +f 3727//432 3728//432 3729//432 +f 3730//432 3731//432 3732//432 +f 3733//432 3734//432 3735//432 +f 3736//432 3737//432 3738//432 +f 3739//432 3740//432 3741//432 +f 3742//432 3743//432 3744//432 +f 3745//432 3746//432 3747//432 +f 3748//432 3749//432 3750//432 +f 3751//432 3752//432 3753//432 +f 3754//432 3755//432 3756//432 +f 3757//432 3758//432 3759//432 +f 3760//432 3761//432 3762//432 +f 3763//432 3764//432 3765//432 +f 3766//432 3767//432 3768//432 +f 3769//432 3770//432 3771//432 +f 3772//432 3773//432 3774//432 +f 3775//432 3776//432 3777//432 +f 3778//432 3779//432 3780//432 +f 3781//209 3782//209 3783//209 +f 3784//209 3785//209 3786//209 +f 3787//209 3788//209 3789//209 +f 3790//209 3791//209 3792//209 +f 3793//432 3794//432 3795//432 +f 3796//432 3797//432 3798//432 +f 3799//432 3800//432 3801//432 +f 3802//432 3803//432 3804//432 +f 3805//432 3806//432 3807//432 +f 3808//432 3809//432 3810//432 +f 3811//5 3812//5 3813//5 +f 3814//758 3815//758 3816//758 +f 3817//5 3818//5 3819//5 +f 3820//5 3821//5 3822//5 +f 3823//759 3824//759 3825//759 +f 3826//5 3827//5 3828//5 +f 3829//759 3830//759 3831//759 +f 3832//5 3833//5 3834//5 +f 3835//440 3836//440 3837//440 +f 3838//440 3839//440 3840//440 +f 3841//440 3842//440 3843//440 +f 3844//760 3845//760 3846//760 +f 3847//329 3848//329 3849//329 +f 3850//329 3851//329 3852//329 +f 3853//329 3854//329 3855//329 +f 3856//34 3857//34 3858//34 +f 3859//34 3860//34 3861//34 +f 3862//34 3863//34 3864//34 +f 3865//34 3866//34 3867//34 +f 3868//34 3869//34 3870//34 +f 3871//34 3872//34 3873//34 +f 3874//34 3875//34 3876//34 +f 3877//34 3878//34 3879//34 +f 3880//34 3881//34 3882//34 +f 3883//34 3884//34 3885//34 +f 3886//761 3887//761 3888//761 +f 3889//762 3890//762 3891//762 +f 3892//763 3893//763 3894//763 +f 3895//764 3896//764 3897//764 +f 3898//765 3899//765 3900//765 +f 3901//766 3902//766 3903//766 +f 3904//767 3905//767 3906//767 +f 3907//768 3908//768 3909//768 +f 3910//769 3911//769 3912//769 +f 3913//770 3914//770 3915//770 +f 3916//771 3917//771 3918//771 +f 3919//772 3920//772 3921//772 +f 3922//773 3923//773 3924//773 +f 3925//774 3926//774 3927//774 +f 3928//775 3929//775 3930//775 +f 3931//776 3932//776 3933//776 +f 3934//777 3935//777 3936//777 +f 3937//778 3938//778 3939//778 +f 3940//779 3941//779 3942//779 +f 3943//780 3944//780 3945//780 +f 3946//781 3947//781 3948//781 +f 3949//782 3950//782 3951//782 +f 3952//783 3953//783 3954//783 +f 3955//784 3956//784 3957//784 +f 3958//785 3959//785 3960//785 +f 3961//786 3962//786 3963//786 +f 3964//787 3965//787 3966//787 +f 3967//788 3968//788 3969//788 +f 3970//789 3971//789 3972//789 +f 3973//790 3974//790 3975//790 +f 3976//791 3977//791 3978//791 +f 3979//792 3980//792 3981//792 +f 3982//793 3983//793 3984//793 +f 3985//794 3986//794 3987//794 +f 3988//795 3989//795 3990//795 +f 3991//796 3992//796 3993//796 +f 3994//797 3995//797 3996//797 +f 3997//798 3998//798 3999//798 +f 4000//799 4001//799 4002//799 +f 4003//800 4004//800 4005//800 +f 4006//801 4007//801 4008//801 +f 4009//802 4010//802 4011//802 +f 4012//803 4013//803 4014//803 +f 4015//804 4016//804 4017//804 +f 4018//805 4019//805 4020//805 +f 4021//806 4022//806 4023//806 +f 4024//807 4025//807 4026//807 +f 4027//808 4028//808 4029//808 +f 4030//809 4031//809 4032//809 +f 4033//810 4034//810 4035//810 +f 4036//811 4037//811 4038//811 +f 4039//812 4040//812 4041//812 +f 4042//813 4043//813 4044//813 +f 4045//814 4046//814 4047//814 +f 4048//815 4049//815 4050//815 +f 4051//816 4052//816 4053//816 +f 4054//817 4055//817 4056//817 +f 4057//818 4058//818 4059//818 +f 4060//819 4061//819 4062//819 +f 4063//820 4064//820 4065//820 +f 4066//821 4067//821 4068//821 +f 4069//822 4070//822 4071//822 +f 4072//823 4073//823 4074//823 +f 4075//824 4076//824 4077//824 +f 4078//825 4079//825 4080//825 +f 4081//826 4082//826 4083//826 +f 4084//827 4085//827 4086//827 +f 4087//828 4088//828 4089//828 +f 4090//829 4091//829 4092//829 +f 4093//830 4094//830 4095//830 +f 4096//831 4097//831 4098//831 +f 4099//832 4100//832 4101//832 +f 4102//208 4103//208 4104//208 +f 4105//208 4106//208 4107//208 +f 4108//436 4109//436 4110//436 +f 4111//436 4112//436 4113//436 +f 4114//436 4115//436 4116//436 +f 4117//436 4118//436 4119//436 +f 4120//436 4121//436 4122//436 +f 4123//436 4124//436 4125//436 +f 4126//436 4127//436 4128//436 +f 4129//436 4130//436 4131//436 +f 4132//436 4133//436 4134//436 +f 4135//436 4136//436 4137//436 +f 4138//833 4139//833 4140//833 +f 4141//833 4142//833 4143//833 +f 4144//1 4145//1 4146//1 +f 4147//1 4148//1 4149//1 +f 4150//1 4151//1 4152//1 +f 4153//1 4154//1 4155//1 +f 4156//1 4157//1 4158//1 +f 4159//1 4160//1 4161//1 +f 4162//834 4163//834 4164//834 +f 4165//1 4166//1 4167//1 +f 4168//1 4169//1 4170//1 +f 4171//1 4172//1 4173//1 +f 4174//1 4175//1 4176//1 +f 4177//1 4178//1 4179//1 +f 4180//1 4181//1 4182//1 +f 4183//1 4184//1 4185//1 +f 4186//1 4187//1 4188//1 +f 4189//1 4190//1 4191//1 +f 4192//1 4193//1 4194//1 +f 4195//119 4196//119 4197//119 +f 4198//119 4199//119 4200//119 +f 4201//119 4202//119 4203//119 +f 4204//119 4205//119 4206//119 +f 4207//119 4208//119 4209//119 +f 4210//119 4211//119 4212//119 +f 4213//119 4214//119 4215//119 +f 4216//835 4217//835 4218//835 +f 4219//836 4220//836 4221//836 +f 4222//837 4223//837 4224//837 +f 4225//838 4226//838 4227//838 +f 4228//839 4229//839 4230//839 +f 4231//840 4232//840 4233//840 +f 4234//840 4235//840 4236//840 +f 4237//841 4238//841 4239//841 +f 4240//842 4241//842 4242//842 +f 4243//842 4244//842 4245//842 +f 4246//843 4247//843 4248//843 +f 4249//843 4250//843 4251//843 +f 4252//843 4253//843 4254//843 +f 4255//843 4256//843 4257//843 +f 4258//843 4259//843 4260//843 +f 4261//843 4262//843 4263//843 +f 4264//843 4265//843 4266//843 +f 4267//844 4268//844 4269//844 +f 4270//845 4271//845 4272//845 +f 4273//843 4274//843 4275//843 +f 4276//846 4277//846 4278//846 +f 4279//847 4280//847 4281//847 +f 4282//848 4283//848 4284//848 +f 4285//849 4286//849 4287//849 +f 4288//850 4289//850 4290//850 +f 4291//851 4292//851 4293//851 +f 4294//852 4295//852 4296//852 +f 4297//853 4298//853 4299//853 +f 4300//854 4301//854 4302//854 +f 4303//855 4304//855 4305//855 +f 4306//311 4307//311 4308//311 +f 4309//856 4310//856 4311//856 +f 4312//311 4313//311 4314//311 +f 4315//311 4316//311 4317//311 +f 4318//311 4319//311 4320//311 +f 4321//311 4322//311 4323//311 +f 4324//311 4325//311 4326//311 +f 4327//311 4328//311 4329//311 +f 4330//311 4331//311 4332//311 +f 4333//311 4334//311 4335//311 +f 4336//311 4337//311 4338//311 +f 4339//311 4340//311 4341//311 +f 4342//311 4343//311 4344//311 +f 4345//311 4346//311 4347//311 +f 4348//833 4349//833 4350//833 +f 4351//833 4352//833 4353//833 +f 4354//209 4355//209 4356//209 +f 4357//209 4358//209 4359//209 +f 4360//209 4361//209 4362//209 +f 4363//312 4364//312 4365//312 +f 4366//312 4367//312 4368//312 +f 4369//312 4370//312 4371//312 +f 4372//208 4373//208 4374//208 +f 4375//208 4376//208 4377//208 +f 4378//312 4379//312 4380//312 +f 4381//312 4382//312 4383//312 +f 4384//312 4385//312 4386//312 +f 4387//312 4388//312 4389//312 +f 4390//312 4391//312 4392//312 +f 4393//119 4394//119 4395//119 +f 4396//119 4397//119 4398//119 +f 4399//119 4400//119 4401//119 +f 4402//119 4403//119 4404//119 +f 4405//119 4406//119 4407//119 +f 4408//119 4409//119 4410//119 +f 4411//119 4412//119 4413//119 +f 4414//119 4415//119 4416//119 diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 42469c6cf6..7cc739fb59 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -73,6 +73,9 @@ UM.PreferencesPage var defaultTheme = UM.Preferences.getValue("general/theme") setDefaultTheme(defaultTheme) + UM.Preferences.resetPreference("usb_printing/enabled") + usbPrintCheckbox.checked = boolCheck(UM.Preferences.getValue("usb_printing/enabled")) + UM.Preferences.resetPreference("general/use_tray_icon") trayIconCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/use_tray_icon")) @@ -285,7 +288,7 @@ UM.PreferencesPage UM.Label { id: themeLabel - text: catalog.i18nc("@label: Please keep the asterix, it's to indicate that a restart is needed.", "Theme*:") + text: catalog.i18nc("@label: Please keep the asterix, it's to indicate that a restart is needed.", "Theme (* restart required):") } ListModel @@ -356,7 +359,37 @@ UM.PreferencesPage checked: boolCheck(UM.Preferences.getValue("general/use_tray_icon")) onClicked: UM.Preferences.setValue("general/use_tray_icon", checked) - text: catalog.i18nc("@option:check", "Add icon to system tray *"); + text: catalog.i18nc("@option:check", "Add icon to system tray (* restart required)"); + } + } + + Item + { + //: Spacer + height: UM.Theme.getSize("default_margin").height + width: UM.Theme.getSize("default_margin").width + } + + UM.Label + { + font: UM.Theme.getFont("medium_bold") + text: catalog.i18nc("@label", "Connection and Control") + } + + UM.TooltipArea + { + width: childrenRect.width; + height: childrenRect.height; + + text: catalog.i18nc("@info:tooltip", "Printing via USB-cable does not work with all printers and scanning for ports can interfere with other connected serial devices (ex: earbuds). It is no longer 'Automatically Enabled' for new Cura installations. If you wish to use USB Printing then enable it by checking the box and then restarting Cura. Please Note: USB Printing is no longer maintained. It will either work with your computer/printer combination, or it won't.") + + UM.CheckBox + { + id: usbPrintCheckbox + checked: boolCheck(UM.Preferences.getValue("usb_printing/enabled")) + onClicked: UM.Preferences.setValue("usb_printing/enabled", checked) + + text: catalog.i18nc("@option:check", "Enable USB-cable printing (* restart required)") } } @@ -536,7 +569,7 @@ UM.PreferencesPage UM.CheckBox { id: forceLayerViewCompatibilityModeCheckbox - text: catalog.i18nc("@option:check", "Force layer view compatibility mode (restart required)") + text: catalog.i18nc("@option:check", "Force layer view compatibility mode (* restart required)") checked: boolCheck(UM.Preferences.getValue("view/force_layer_view_compatibility_mode")) onCheckedChanged: UM.Preferences.setValue("view/force_layer_view_compatibility_mode", checked) } @@ -663,7 +696,7 @@ UM.PreferencesPage UM.CheckBox { id: flipToolhandleYCheckbox - text: catalog.i18nc("@option:check", "Flip model's toolhandle Y axis (restart required)") + text: catalog.i18nc("@option:check", "Flip model's toolhandle Y axis (* restart required)") checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked) } @@ -694,7 +727,7 @@ UM.PreferencesPage UM.CheckBox { id: singleInstanceCheckbox - text: catalog.i18nc("@option:check","Use a single instance of Cura *") + text: catalog.i18nc("@option:check","Use a single instance of Cura (* restart required)") checked: boolCheck(UM.Preferences.getValue("cura/single_instance")) onCheckedChanged: UM.Preferences.setValue("cura/single_instance", checked) @@ -1102,7 +1135,7 @@ UM.PreferencesPage id: languageCaption //: Language change warning - text: catalog.i18nc("@label", "*You will need to restart the application for these changes to have effect.") + text: catalog.i18nc("@label", "*) You will need to restart the application for these changes to have effect.") wrapMode: Text.WordWrap font.italic: true } diff --git a/resources/qml/WelcomePages/AddUltimakerPrinter.qml b/resources/qml/WelcomePages/AddUltimakerPrinter.qml index 0c9b7d4f7f..7b1a9ced20 100644 --- a/resources/qml/WelcomePages/AddUltimakerPrinter.qml +++ b/resources/qml/WelcomePages/AddUltimakerPrinter.qml @@ -129,7 +129,6 @@ Control text: catalog.i18nc("@button", "Sign in to Digital Factory") onClicked: function() { - Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/printers?add_printer=true&utm_source=cura&utm_medium=software&utm_campaign=onboarding-add-printer") text = catalog.i18nc("@button", "Waiting for new printers") busy = true; enabled = false; diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 54e95462e0..106582d1a1 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -210,7 +210,13 @@ Item anchors.bottom: parent.bottom text: catalog.i18nc("@button", "Sign in") - onClicked: Cura.API.account.login() + onClicked: function() + { + text = catalog.i18nc("@button", "Waiting for new printers") + busy = true; + enabled = false; + Cura.API.account.isLoggedIn? Cura.API.account.sync():Cura.API.account.login(); + } // Content Item is used in order to align the text inside the button. Without it, when resizing the // button, the text will be aligned on the left contentItem: Text { diff --git a/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_high_quality.inst.cfg b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_high_quality.inst.cfg new file mode 100644 index 0000000000..fe48dcc12c --- /dev/null +++ b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_high_quality.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = anycubic_kobra_s1 +name = High Quality +version = 4 + +[metadata] +global_quality = True +quality_type = high +setting_version = 25 +type = quality +weight = 1 + +[values] +adhesion_type = brim +bottom_thickness = =layer_height*3 +brim_width = 5 +infill_sparse_density = 15 +initial_layer_line_width_factor = 125 +layer_height = 0.2 +layer_height_0 = 0.2 +line_width = 0.42 +material_bed_temperature = 55 +material_print_temperature = 215.0 +skirt_height = 1 +speed_layer_0 = 40 +speed_print = 180.0 +speed_travel = 300.0 +speed_travel_layer_0 = 60 +speed_wall = 180.0 +speed_wall_0 = 60.0 +speed_wall_x = 180.0 +top_thickness = =layer_height*5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_standard.inst.cfg b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_standard.inst.cfg new file mode 100644 index 0000000000..fd6a2962a3 --- /dev/null +++ b/resources/quality/anycubic_kobra_s1/anycubic_kobra_s1_standard.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = anycubic_kobra_s1 +name = Standard +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 25 +type = quality +weight = 0 + +[values] +adhesion_type = brim +bottom_thickness = =layer_height*3 +brim_width = 5 +infill_sparse_density = 15 +initial_layer_line_width_factor = 125 +layer_height = 0.2 +layer_height_0 = 0.2 +line_width = 0.42 +material_bed_temperature = 55 +material_print_temperature = 215.0 +skirt_height = 1 +speed_layer_0 = 50 +speed_print = 300.0 +speed_travel = 300.0 +speed_travel_layer_0 = 80 +speed_wall = 300.0 +speed_wall_0 = 200.0 +speed_wall_x = 300.0 +top_thickness = =layer_height*5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.15mm.inst.cfg new file mode 100644 index 0000000000..c6548f0173 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.15mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_factor4 +name = Normal +version = 4 + +[metadata] +material = generic_bvoh +quality_type = fast +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -1 + +[values] +acceleration_print = 1000.0 +acceleration_support_bottom = 100 +acceleration_support_interface = 1000 +brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 +max_flow_acceleration = 1 +minimum_support_area = 4 +prime_tower_flow = 90 +prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 +skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_xy_distance = 2 +support_z_distance = 0 +switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.1mm.inst.cfg new file mode 100644 index 0000000000..6f1b986c4e --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.1mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_factor4 +name = Fine +version = 4 + +[metadata] +material = generic_bvoh +quality_type = normal +setting_version = 25 +type = quality +variant = BB 0.4 +weight = 0 + +[values] +acceleration_print = 1000.0 +acceleration_support_bottom = 100 +acceleration_support_interface = 1000 +brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 +max_flow_acceleration = 1 +minimum_support_area = 4 +prime_tower_flow = 90 +prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 +skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_xy_distance = 2 +support_z_distance = 0 +switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..ff49315c1e --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.2mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -2 + +[values] +acceleration_print = 1000.0 +acceleration_support_bottom = 100 +acceleration_support_interface = 1000 +brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 +max_flow_acceleration = 1 +minimum_support_area = 4 +prime_tower_flow = 90 +prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 +skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_xy_distance = 2 +support_z_distance = 0 +switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..209b16b697 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_bvoh_0.3mm.inst.cfg @@ -0,0 +1,44 @@ +[general] +definition = ultimaker_factor4 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -3 + +[values] +acceleration_print = 1000.0 +acceleration_support_bottom = 100 +acceleration_support_interface = 1000 +brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 +max_flow_acceleration = 1 +minimum_support_area = 4 +prime_tower_flow = 90 +prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 +skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_xy_distance = 2 +support_z_distance = 0 +switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..d10b0c939e --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.2mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -2 + +[values] +acceleration_print = 1000.0 +acceleration_support_bottom = 100 +acceleration_support_interface = 1000 +brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 +max_flow_acceleration = 1 +minimum_support_area = 4 +prime_tower_flow = 90 +prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 +skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_xy_distance = 2 +support_z_distance = 0 +switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..dd2e2da565 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.3mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_factor4 +name = Extra Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -3 + +[values] +acceleration_print = 1000.0 +acceleration_support_bottom = 100 +acceleration_support_interface = 1000 +brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 +max_flow_acceleration = 1 +minimum_support_area = 4 +prime_tower_flow = 90 +prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 +skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_xy_distance = 2 +support_z_distance = 0 +switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.4mm.inst.cfg new file mode 100644 index 0000000000..fa230a1f5f --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_bvoh_0.4mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_factor4 +name = Sprint +version = 4 + +[metadata] +material = generic_bvoh +quality_type = superdraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -4 + +[values] +acceleration_print = 1000.0 +acceleration_support_bottom = 100 +acceleration_support_interface = 1000 +brim_replaces_support = False +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +gradual_flow_discretisation_step_size = 0.1 +gradual_flow_enabled = True +gradual_support_infill_steps = 0 +initial_layer_line_width_factor = 125 +jerk_print = 10 +material_flow_layer_0 = 90 +max_flow_acceleration = 1 +minimum_support_area = 4 +prime_tower_flow = 90 +prime_tower_min_volume = 15 +retraction_min_travel = 5.0 +retraction_prime_speed = 10.0 +skin_material_flow = =material_flow * 0.93 +speed_print = 30 +support_angle = 45 +support_infill_rate = 20 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_offset = 1 +support_offset = 3 +support_xy_distance = 2 +support_z_distance = 0 +switch_extruder_prime_speed = 10.0 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm.inst.cfg index 6a37013164..9013b184ef 100644 --- a/resources/quality/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_nylon-cf-slide_0.2mm.inst.cfg @@ -15,6 +15,28 @@ weight = -2 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True inset_direction = outside_in +jerk_print = 30 max_flow_acceleration = 1 +retraction_combing_max_distance = 5 +roofing_pattern = lines skin_material_flow = =material_flow * 0.965 +skin_outline_count = 0 +skin_overlap = 15 +speed_print = 80 +speed_wall_x = 60 +support_bottom_distance = =support_z_distance +support_structure = tree +support_supported_skin_fan_speed = 100 +support_tree_angle = 45 +support_tree_angle_slow = 25 +support_tree_bp_diameter = 25 +support_tree_branch_diameter = 5 +support_tree_max_diameter = 15 +support_tree_tip_diameter = 2 +support_xy_distance_overhang = 0.8 +support_z_distance = =2*layer_height +travel_avoid_other_parts = false +wall_line_width_x = 0.8 +xy_offset = -0.05 +z_seam_type = sharpest_corner diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg index 87191547f6..3fc13c2c3f 100644 --- a/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg @@ -16,11 +16,32 @@ cool_fan_speed_max = =cool_fan_speed gradual_flow_discretisation_step_size = 0.5 gradual_flow_enabled = True infill_wall_line_count = 1 +inset_direction = outside_in +jerk_print = 30 material_shrinkage_percentage = 100.15 material_shrinkage_percentage_z = 100.15 max_flow_acceleration = 0.1 -skin_material_flow = =material_flow * 0.93 -speed_print = 60 -xy_offset = =machine_nozzle_size * -0.25 +retraction_combing_max_distance = 5 +roofing_pattern = lines +skin_material_flow = =material_flow * 0.965 +skin_outline_count = 0 +skin_overlap = 15 +speed_print = 80 +speed_wall_x = 60 +support_bottom_distance = =support_z_distance +support_structure = tree +support_supported_skin_fan_speed = 100 +support_tree_angle = 45 +support_tree_angle_slow = 25 +support_tree_bp_diameter = 25 +support_tree_branch_diameter = 5 +support_tree_max_diameter = 15 +support_tree_tip_diameter = 2 +support_xy_distance_overhang = 0.8 +support_z_distance = =2*layer_height +travel_avoid_other_parts = false +wall_line_width_x = 0.8 +xy_offset = -0.05 xy_offset_layer_0 = =xy_offset +z_seam_type = sharpest_corner diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm.inst.cfg index c19753d2f3..a622daab23 100644 --- a/resources/quality/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_nylon-cf-slide_0.2mm.inst.cfg @@ -15,6 +15,28 @@ weight = -2 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True inset_direction = outside_in +jerk_print = 30 max_flow_acceleration = 1 +retraction_combing_max_distance = 5 +roofing_pattern = lines skin_material_flow = =material_flow * 0.965 +skin_outline_count = 0 +skin_overlap = 15 +speed_print = 80 +speed_wall_x = 60 +support_bottom_distance = =support_z_distance +support_structure = tree +support_supported_skin_fan_speed = 100 +support_tree_angle = 45 +support_tree_angle_slow = 25 +support_tree_bp_diameter = 25 +support_tree_branch_diameter = 5 +support_tree_max_diameter = 15 +support_tree_tip_diameter = 2 +support_xy_distance_overhang = 0.8 +support_z_distance = =2*layer_height +travel_avoid_other_parts = false +wall_line_width_x = 0.8 +xy_offset = -0.05 +z_seam_type = sharpest_corner diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg index 6135812dc6..453ba31a5f 100644 --- a/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg @@ -16,11 +16,32 @@ cool_fan_speed_max = =cool_fan_speed gradual_flow_discretisation_step_size = 0.5 gradual_flow_enabled = True infill_wall_line_count = 1 +inset_direction = outside_in +jerk_print = 30 material_shrinkage_percentage = 100.15 material_shrinkage_percentage_z = 100.15 max_flow_acceleration = 0.1 -skin_material_flow = =material_flow * 0.93 -speed_print = 60 -xy_offset = =machine_nozzle_size * -0.25 +retraction_combing_max_distance = 5 +roofing_pattern = lines +skin_material_flow = =material_flow * 0.965 +skin_outline_count = 0 +skin_overlap = 15 +speed_print = 80 +speed_wall_x = 60 +support_bottom_distance = =support_z_distance +support_structure = tree +support_supported_skin_fan_speed = 100 +support_tree_angle = 45 +support_tree_angle_slow = 25 +support_tree_bp_diameter = 25 +support_tree_branch_diameter = 5 +support_tree_max_diameter = 15 +support_tree_tip_diameter = 2 +support_xy_distance_overhang = 0.8 +support_z_distance = =2*layer_height +travel_avoid_other_parts = false +wall_line_width_x = 0.8 +xy_offset = -0.05 xy_offset_layer_0 = =xy_offset +z_seam_type = sharpest_corner diff --git a/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg index b4b4514265..e445deca6e 100644 --- a/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg @@ -16,11 +16,31 @@ adhesion_type = brim gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True infill_wall_line_count = 1 +inset_direction = outside_in +jerk_print = 30 max_flow_acceleration = 1 retraction_combing_max_distance = 2 roofing_material_flow = =material_flow -skin_material_flow = =material_flow * 0.93 -speed_print = 60 -xy_offset = =machine_nozzle_size * -0.25 +roofing_pattern = lines +skin_material_flow = =material_flow * 0.965 +skin_outline_count = 0 +skin_overlap = 15 +speed_print = 80 +speed_wall_x = 60 +support_bottom_distance = =support_z_distance +support_structure = tree +support_supported_skin_fan_speed = 100 +support_tree_angle = 45 +support_tree_angle_slow = 25 +support_tree_bp_diameter = 25 +support_tree_branch_diameter = 5 +support_tree_max_diameter = 15 +support_tree_tip_diameter = 2 +support_xy_distance_overhang = 0.8 +support_z_distance = =2*layer_height +travel_avoid_other_parts = false +wall_line_width_x = 0.8 +xy_offset = -0.05 xy_offset_layer_0 = =xy_offset +z_seam_type = sharpest_corner diff --git a/resources/quality/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm.inst.cfg index 3f567dc761..254d5cd9dd 100644 --- a/resources/quality/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_ht0.6_nylon-cf-slide_0.2mm.inst.cfg @@ -15,6 +15,28 @@ weight = -2 gradual_flow_discretisation_step_size = 0.1 gradual_flow_enabled = True inset_direction = outside_in +jerk_print = 30 max_flow_acceleration = 1 +retraction_combing_max_distance = 5 +roofing_pattern = lines skin_material_flow = =material_flow * 0.965 +skin_outline_count = 0 +skin_overlap = 15 +speed_print = 80 +speed_wall_x = 60 +support_bottom_distance = =support_z_distance +support_structure = tree +support_supported_skin_fan_speed = 100 +support_tree_angle = 45 +support_tree_angle_slow = 25 +support_tree_bp_diameter = 25 +support_tree_branch_diameter = 5 +support_tree_max_diameter = 15 +support_tree_tip_diameter = 2 +support_xy_distance_overhang = 0.8 +support_z_distance = =2*layer_height +travel_avoid_other_parts = false +wall_line_width_x = 0.8 +xy_offset = -0.05 +z_seam_type = sharpest_corner diff --git a/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg index ff09c1a087..66f74d1c84 100644 --- a/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg @@ -16,11 +16,32 @@ cool_fan_speed_max = =cool_fan_speed gradual_flow_discretisation_step_size = 0.5 gradual_flow_enabled = True infill_wall_line_count = 1 +inset_direction = outside_in +jerk_print = 30 material_shrinkage_percentage = 100.15 material_shrinkage_percentage_z = 100.15 max_flow_acceleration = 0.1 -skin_material_flow = =material_flow * 0.93 -speed_print = 60 -xy_offset = =machine_nozzle_size * -0.25 +retraction_combing_max_distance = 5 +roofing_pattern = lines +skin_material_flow = =material_flow * 0.965 +skin_outline_count = 0 +skin_overlap = 15 +speed_print = 80 +speed_wall_x = 60 +support_bottom_distance = =support_z_distance +support_structure = tree +support_supported_skin_fan_speed = 100 +support_tree_angle = 45 +support_tree_angle_slow = 25 +support_tree_bp_diameter = 25 +support_tree_branch_diameter = 5 +support_tree_max_diameter = 15 +support_tree_tip_diameter = 2 +support_xy_distance_overhang = 0.8 +support_z_distance = =2*layer_height +travel_avoid_other_parts = false +wall_line_width_x = 0.8 +xy_offset = -0.05 xy_offset_layer_0 = =xy_offset +z_seam_type = sharpest_corner diff --git a/resources/quality/ultimaker_method/um_method_1a_um-nylon-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-nylon-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..21785ed4ff --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1a_um-nylon-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 0 +cool_fan_speed_max = 0 +cool_min_layer_time = 8 +cool_min_speed = 10 +cool_min_temperature = 250 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_flow = 105 +raft_base_line_width = 1.2 +raft_base_speed = 10 +raft_base_thickness = 0.6 +raft_interface_thickness = 0.25 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +small_skin_width = 3.6 +speed_prime_tower = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 3/5 +speed_topbottom = =speed_roofing +speed_wall = =speed_print * 3/5 +speed_wall_0 = =speed_wall * 5/6 +speed_wall_x = =speed_wall +support_angle = 30 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = =0 if support_structure == 'tree' else 12.0 +support_interface_height = 0.406 +support_interface_material_flow = 95 +support_interface_pattern = lines +support_line_width = =line_width * 0.75 +support_material_flow = 92 +support_roof_density = 50 +support_roof_height = =support_interface_height +support_structure = tree +support_supported_skin_fan_speed = 75 +support_wall_count = 1 +support_xy_distance = 0.3 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..c9fcc9dae7 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 0 +cool_fan_speed_max = 0 +cool_min_layer_time = 8 +cool_min_speed = 10 +cool_min_temperature = 250 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_flow = 105 +raft_base_line_width = 1.2 +raft_base_speed = 10 +raft_base_thickness = 0.6 +raft_interface_thickness = 0.25 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +small_skin_width = 3.6 +speed_prime_tower = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 3/5 +speed_topbottom = =speed_roofing +speed_wall = =speed_print * 3/5 +speed_wall_0 = =speed_wall * 5/6 +speed_wall_x = =speed_wall +support_angle = 30 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = =0 if support_structure == 'tree' else 12.0 +support_interface_height = 0.406 +support_interface_material_flow = 95 +support_interface_pattern = lines +support_line_width = =line_width * 0.75 +support_material_flow = 92 +support_roof_density = 50 +support_roof_height = =support_interface_height +support_structure = tree +support_supported_skin_fan_speed = 75 +support_wall_count = 1 +support_xy_distance = 0.3 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..2325dbfa00 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 0 +cool_fan_speed_max = 0 +cool_min_layer_time = 8 +cool_min_speed = 10 +cool_min_temperature = 250 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_flow = 105 +raft_base_line_width = 1.2 +raft_base_speed = 10 +raft_base_thickness = 0.6 +raft_interface_thickness = 0.25 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +small_skin_width = 3.6 +speed_prime_tower = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 3/5 +speed_topbottom = =speed_roofing +speed_wall = =speed_print * 3/5 +speed_wall_0 = =speed_wall * 5/6 +speed_wall_x = =speed_wall +support_angle = 30 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = =0 if support_structure == 'tree' else 12.0 +support_interface_height = 0.406 +support_interface_material_flow = 95 +support_interface_pattern = lines +support_line_width = =line_width * 0.75 +support_material_flow = 92 +support_roof_density = 50 +support_roof_height = =support_interface_height +support_structure = tree +support_supported_skin_fan_speed = 75 +support_wall_count = 1 +support_xy_distance = 0.3 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-nylon-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-nylon-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..fa7f524998 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-nylon-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 0 +cool_fan_speed_max = 0 +cool_min_layer_time = 8 +cool_min_speed = 10 +cool_min_temperature = 250 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_flow = 105 +raft_base_line_width = 1.2 +raft_base_speed = 10 +raft_base_thickness = 0.6 +raft_interface_thickness = 0.25 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +small_skin_width = 3.6 +speed_prime_tower = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 3/5 +speed_topbottom = =speed_roofing +speed_wall = =speed_print * 3/5 +speed_wall_0 = =speed_wall * 5/6 +speed_wall_x = =speed_wall +support_angle = 30 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = =0 if support_structure == 'tree' else 12.0 +support_interface_height = 0.406 +support_interface_material_flow = 95 +support_interface_pattern = lines +support_line_width = =line_width * 0.75 +support_material_flow = 92 +support_roof_density = 50 +support_roof_height = =support_interface_height +support_structure = tree +support_supported_skin_fan_speed = 75 +support_wall_count = 1 +support_xy_distance = 0.3 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..f167c56520 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 0 +cool_fan_speed_max = 0 +cool_min_layer_time = 8 +cool_min_speed = 10 +cool_min_temperature = 250 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_flow = 105 +raft_base_line_width = 1.2 +raft_base_speed = 10 +raft_base_thickness = 0.6 +raft_interface_thickness = 0.25 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +small_skin_width = 3.6 +speed_prime_tower = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 3/5 +speed_topbottom = =speed_roofing +speed_wall = =speed_print * 3/5 +speed_wall_0 = =speed_wall * 5/6 +speed_wall_x = =speed_wall +support_angle = 30 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = =0 if support_structure == 'tree' else 12.0 +support_interface_height = 0.406 +support_interface_material_flow = 95 +support_interface_pattern = lines +support_line_width = =line_width * 0.75 +support_material_flow = 92 +support_roof_density = 50 +support_roof_height = =support_interface_height +support_structure = tree +support_supported_skin_fan_speed = 75 +support_wall_count = 1 +support_xy_distance = 0.3 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 4897ef28bc..e5cff57c0e 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -16,10 +16,16 @@ brim_replaces_support = False cool_fan_enabled = False cool_min_temperature = =material_print_temperature raft_airgap = 0.0 -raft_interface_flow = 110 -raft_interface_infill_overlap = 25 -raft_interface_speed = 90 -raft_interface_z_offset = -0.1 +raft_interface_flow = 108 +raft_interface_infill_overlap = 35 +raft_interface_layers = 2 +raft_interface_line_width = 0.52 +raft_interface_speed = 60 +raft_interface_thickness = 0.25 +raft_interface_z_offset = -0.15 +raft_surface_flow = 105 +raft_surface_layers = 2 +raft_surface_z_offset = -0.1 retract_at_layer_change = True retraction_min_travel = 5 speed_prime_tower = 25.0 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..36c3360377 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon_175 +quality_type = draft +setting_version = 25 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 0 +cool_fan_speed_max = 0 +cool_min_layer_time = 8 +cool_min_speed = 10 +cool_min_temperature = 250 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_flow = 105 +raft_base_line_width = 1.2 +raft_base_speed = 10 +raft_base_thickness = 0.6 +raft_interface_thickness = 0.25 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +small_skin_width = 3.6 +speed_prime_tower = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 3/5 +speed_topbottom = =speed_roofing +speed_wall = =speed_print * 3/5 +speed_wall_0 = =speed_wall * 5/6 +speed_wall_x = =speed_wall +support_angle = 30 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = =0 if support_structure == 'tree' else 12.0 +support_interface_height = 0.406 +support_interface_material_flow = 95 +support_interface_pattern = lines +support_line_width = =line_width * 0.75 +support_material_flow = 92 +support_roof_density = 50 +support_roof_height = =support_interface_height +support_structure = tree +support_supported_skin_fan_speed = 75 +support_wall_count = 1 +support_xy_distance = 0.3 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 3c5935b341..f76ef0fe9b 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -16,10 +16,16 @@ brim_replaces_support = False cool_fan_enabled = False cool_min_temperature = =material_print_temperature raft_airgap = 0.0 -raft_interface_flow = 110 -raft_interface_infill_overlap = 25 -raft_interface_speed = 90 -raft_interface_z_offset = -0.1 +raft_interface_flow = 108 +raft_interface_infill_overlap = 35 +raft_interface_layers = 2 +raft_interface_line_width = 0.52 +raft_interface_speed = 60 +raft_interface_thickness = 0.25 +raft_interface_z_offset = -0.15 +raft_surface_flow = 105 +raft_surface_layers = 2 +raft_surface_z_offset = -0.1 retract_at_layer_change = True retraction_min_travel = 5 speed_prime_tower = 25.0 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.15mm.inst.cfg new file mode 100644 index 0000000000..93c1d4947d --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.15mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s3 +name = Normal +version = 4 + +[metadata] +material = generic_bvoh +quality_type = fast +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -1 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = =2 * layer_height +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.1mm.inst.cfg new file mode 100644 index 0000000000..f06f8deb6f --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.1mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s3 +name = Fine +version = 4 + +[metadata] +material = generic_bvoh +quality_type = normal +setting_version = 25 +type = quality +variant = BB 0.4 +weight = 0 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = =2 * layer_height +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..61059651ef --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.2mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s3 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -2 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..8f06dd0562 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_bvoh_0.3mm.inst.cfg @@ -0,0 +1,37 @@ +[general] +definition = ultimaker_s3 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -3 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = 0.3 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..a9d67b0552 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.2mm.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = ultimaker_s3 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -2 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..016887c23c --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.3mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s3 +name = Extra Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -3 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = 0.3 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.4mm.inst.cfg new file mode 100644 index 0000000000..4d4bffbab9 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_bvoh_0.4mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s3 +name = Sprint +version = 4 + +[metadata] +material = generic_bvoh +quality_type = superdraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -4 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.15mm.inst.cfg new file mode 100644 index 0000000000..e5dc8e7295 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.15mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s5 +name = Normal +version = 4 + +[metadata] +material = generic_bvoh +quality_type = fast +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -1 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = =2 * layer_height +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.1mm.inst.cfg new file mode 100644 index 0000000000..ed7638a4e0 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.1mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s5 +name = Fine +version = 4 + +[metadata] +material = generic_bvoh +quality_type = normal +setting_version = 25 +type = quality +variant = BB 0.4 +weight = 0 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = =2 * layer_height +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..1d02c886bc --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.2mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s5 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -2 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..b759ae0bb3 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_bvoh_0.3mm.inst.cfg @@ -0,0 +1,37 @@ +[general] +definition = ultimaker_s5 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -3 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = 0.3 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..58875826ad --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.2mm.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = ultimaker_s5 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -2 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..74b33f5366 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.3mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s5 +name = Extra Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -3 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = 0.3 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.4mm.inst.cfg new file mode 100644 index 0000000000..cd501dcf0e --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_bvoh_0.4mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s5 +name = Sprint +version = 4 + +[metadata] +material = generic_bvoh +quality_type = superdraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -4 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 20 +jerk_support = 20 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_abs_0.1mm.inst.cfg new file mode 100644 index 0000000000..4cac8a6e4e --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_abs_0.1mm.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +cool_fan_speed_0 = 0 +material_print_temperature = =default_material_print_temperature - 20 +speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_cpe_0.1mm.inst.cfg new file mode 100644 index 0000000000..06e928787c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_cpe_0.1mm.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +material_print_temperature = =default_material_print_temperature - 15 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_nylon_0.1mm.inst.cfg new file mode 100644 index 0000000000..7cb88c76e8 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_nylon_0.1mm.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 20 +ooze_shield_angle = 40 +raft_airgap = 0.4 +speed_print = 70 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_pc_0.1mm.inst.cfg new file mode 100644 index 0000000000..e9482a60cc --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_pc_0.1mm.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +material_print_temperature = =default_material_print_temperature - 10 +multiple_mesh_overlap = 0 +ooze_shield_angle = 40 +prime_tower_enable = True +prime_tower_wipe_enabled = True +raft_airgap = 0.25 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance +support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_petg_0.1mm.inst.cfg new file mode 100644 index 0000000000..0a221d1d40 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_petg_0.1mm.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +material_print_temperature = =default_material_print_temperature - 15 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..ef6714547c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_pla_0.1mm.inst.cfg @@ -0,0 +1,33 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +brim_width = 8 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 10 +retraction_hop = 0.2 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 25 / 30) +speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.72 +travel_avoid_distance = 0.4 +wall_0_inset = 0.015 +wall_0_wipe_dist = 0.25 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_pp_0.1mm.inst.cfg new file mode 100644 index 0000000000..72d14662b7 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_pp_0.1mm.inst.cfg @@ -0,0 +1,46 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pp +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +brim_width = 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 2 +multiple_mesh_overlap = 0 +prime_tower_enable = False +prime_tower_size = 16 +prime_tower_wipe_enabled = True +retraction_count_max = 15 +retraction_extra_prime_amount = 0.2 +retraction_hop = 2 +retraction_hop_only_when_collides = True +retraction_prime_speed = 15 +speed_print = 25 +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +top_bottom_thickness = 1 +travel_avoid_distance = 3 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_tough-pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..0c1fbd0049 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_tough-pla_0.1mm.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +brim_width = 8 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 5 +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 20 / 30) +speed_wall = =math.ceil(speed_print * 25 / 30) +speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.72 +wall_0_inset = 0.015 +wall_0_wipe_dist = 0.25 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-abs_0.1mm.inst.cfg new file mode 100644 index 0000000000..8ea63f0592 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-abs_0.1mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_fan_speed_0 = 0 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.15 +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-petg_0.1mm.inst.cfg new file mode 100644 index 0000000000..2a428ea22c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-petg_0.1mm.inst.cfg @@ -0,0 +1,71 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = False +retraction_amount = 8 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..0208068358 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-pla_0.1mm.inst.cfg @@ -0,0 +1,71 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.25_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-tough-pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..073424086f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.25_um-tough-pla_0.1mm.inst.cfg @@ -0,0 +1,72 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.25 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.06mm.inst.cfg new file mode 100644 index 0000000000..e69d4ca91c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.06mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +machine_nozzle_cool_down_speed = 0.8 +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 20 +material_print_temperature = =default_material_print_temperature - 10 +prime_tower_enable = False +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.15mm.inst.cfg new file mode 100644 index 0000000000..0967bbae16 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.15mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 20 +prime_tower_enable = False +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 45 / 60) +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_wall = =math.ceil(speed_print * 40 / 60) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.1mm.inst.cfg new file mode 100644 index 0000000000..03ef0942d0 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.1mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 20 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = False +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_print = 55 +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.2mm.inst.cfg new file mode 100644 index 0000000000..47517baba6 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.2mm.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 20 +material_print_temperature = =default_material_print_temperature + 5 +prime_tower_enable = False +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 50 / 60) +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 35 / 60) +speed_wall = =math.ceil(speed_print * 45 / 60) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.3mm.inst.cfg new file mode 100644 index 0000000000..fe9949f23c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_abs_0.3mm.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 20 +material_print_temperature = =default_material_print_temperature + 7 +prime_tower_enable = False +raft_airgap = 0.15 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.15mm.inst.cfg new file mode 100644 index 0000000000..eceb885cfc --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.15mm.inst.cfg @@ -0,0 +1,33 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bam +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +speed_print = 80 +speed_topbottom = =math.ceil(speed_print * 30 / 80) +speed_wall = =math.ceil(speed_print * 40 / 80) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_infill_sparse_thickness = =2 * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +top_bottom_thickness = 1 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.1mm.inst.cfg new file mode 100644 index 0000000000..cddaf8cee4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.1mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bam +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_infill_sparse_thickness = =2 * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +top_bottom_thickness = 1 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.2mm.inst.cfg new file mode 100644 index 0000000000..6b22de0fba --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.2mm.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bam +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 5 +prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +speed_topbottom = =math.ceil(speed_print * 35 / 70) +speed_wall = =math.ceil(speed_print * 50 / 70) +speed_wall_0 = =math.ceil(speed_wall * 35 / 50) +support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +top_bottom_thickness = 1 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.3mm.inst.cfg new file mode 100644 index 0000000000..d1a117ef9c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_bam_0.3mm.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bam +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +brim_replaces_support = False +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 5 +prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +speed_topbottom = =math.ceil(speed_print * 35 / 70) +speed_wall = =math.ceil(speed_print * 50 / 70) +speed_wall_0 = =math.ceil(speed_wall * 35 / 50) +support_angle = 45 +support_bottom_distance = 0.3 +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = 0.3 +top_bottom_thickness = 1 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.06mm.inst.cfg new file mode 100644 index 0000000000..b075dd7003 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.06mm.inst.cfg @@ -0,0 +1,37 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +infill_wipe_dist = 0 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 8 +multiple_mesh_overlap = 0 +prime_tower_enable = True +prime_tower_wipe_enabled = True +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 35) +speed_wall = =math.ceil(speed_print * 35 / 40) +speed_wall_0 = =math.ceil(speed_wall * 30 / 35) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.15mm.inst.cfg new file mode 100644 index 0000000000..d8c18fec07 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.15mm.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +infill_wipe_dist = 0 +machine_min_cool_heat_time_window = 15 +multiple_mesh_overlap = 0 +prime_tower_enable = True +prime_tower_wipe_enabled = True +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 45 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.1mm.inst.cfg new file mode 100644 index 0000000000..18d1369a20 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.1mm.inst.cfg @@ -0,0 +1,37 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +infill_wipe_dist = 0 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +multiple_mesh_overlap = 0 +prime_tower_enable = True +prime_tower_wipe_enabled = True +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 35) +speed_wall = =math.ceil(speed_print * 35 / 40) +speed_wall_0 = =math.ceil(speed_wall * 30 / 35) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.2mm.inst.cfg new file mode 100644 index 0000000000..68329d7fe2 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +infill_wipe_dist = 0 +machine_min_cool_heat_time_window = 15 +multiple_mesh_overlap = 0 +prime_tower_enable = True +prime_tower_wipe_enabled = True +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_prime_speed = =retraction_speed +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 40 / 50) +speed_wall = =math.ceil(speed_print * 50 / 50) +speed_wall_0 = =math.ceil(speed_wall * 40 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.06mm.inst.cfg new file mode 100644 index 0000000000..f34a1e71e3 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.06mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 10 +retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 40 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.15mm.inst.cfg new file mode 100644 index 0000000000..e04f9df28f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.15mm.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 50 / 60) +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_wall = =math.ceil(speed_print * 40 / 60) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.1mm.inst.cfg new file mode 100644 index 0000000000..08ee246d6b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.1mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 45 / 55) +speed_print = 55 +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..c37344f00a --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_cpe_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +material_print_temperature = =default_material_print_temperature + 5 +retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 50 / 60) +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 35 / 60) +speed_wall = =math.ceil(speed_print * 45 / 60) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.06mm.inst.cfg new file mode 100644 index 0000000000..40b974c7a1 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.06mm.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +material_print_temperature = =default_material_print_temperature - 5 +ooze_shield_angle = 40 +raft_airgap = 0.4 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.15mm.inst.cfg new file mode 100644 index 0000000000..eb040d39d4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.15mm.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +ooze_shield_angle = 40 +raft_airgap = 0.4 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.1mm.inst.cfg new file mode 100644 index 0000000000..219af55c07 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.1mm.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +material_print_temperature = =default_material_print_temperature - 5 +ooze_shield_angle = 40 +raft_airgap = 0.4 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.2mm.inst.cfg new file mode 100644 index 0000000000..029c0bd65b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_nylon_0.2mm.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +material_print_temperature = =default_material_print_temperature + 5 +ooze_shield_angle = 40 +raft_airgap = 0.4 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.06mm.inst.cfg new file mode 100644 index 0000000000..46565f6a32 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.06mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 20 +multiple_mesh_overlap = 0 +ooze_shield_angle = 40 +prime_tower_enable = True +prime_tower_wipe_enabled = True +raft_airgap = 0.25 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance +support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.15mm.inst.cfg new file mode 100644 index 0000000000..4ace483ae8 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.15mm.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +multiple_mesh_overlap = 0 +ooze_shield_angle = 40 +prime_tower_enable = True +prime_tower_wipe_enabled = True +raft_airgap = 0.25 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance +support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.1mm.inst.cfg new file mode 100644 index 0000000000..b1a3df5573 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.1mm.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 10 +multiple_mesh_overlap = 0 +ooze_shield_angle = 40 +prime_tower_enable = True +prime_tower_wipe_enabled = True +raft_airgap = 0.25 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance +support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.2mm.inst.cfg new file mode 100644 index 0000000000..ea03577c63 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pc_0.2mm.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +multiple_mesh_overlap = 0 +ooze_shield_angle = 40 +prime_tower_enable = True +prime_tower_wipe_enabled = True +raft_airgap = 0.25 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance +support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.06mm.inst.cfg new file mode 100644 index 0000000000..0ad128a581 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.06mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 10 +speed_infill = =math.ceil(speed_print * 40 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.15mm.inst.cfg new file mode 100644 index 0000000000..b47e0affb8 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.15mm.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +speed_infill = =math.ceil(speed_print * 50 / 60) +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_wall = =math.ceil(speed_print * 40 / 60) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.1mm.inst.cfg new file mode 100644 index 0000000000..cc00935dbd --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.1mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +speed_infill = =math.ceil(speed_print * 45 / 55) +speed_print = 55 +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.2mm.inst.cfg new file mode 100644 index 0000000000..34c1cde3b1 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.2mm.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +material_print_temperature = =default_material_print_temperature + 5 +speed_infill = =math.ceil(speed_print * 50 / 60) +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 35 / 60) +speed_wall = =math.ceil(speed_print * 45 / 60) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.3mm.inst.cfg new file mode 100644 index 0000000000..1e21fbfa90 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_petg_0.3mm.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +material_print_temperature = =default_material_print_temperature + 5 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.06mm.inst.cfg new file mode 100644 index 0000000000..d76af8d6be --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.06mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature - 5 +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 35 / 50) +speed_wall = =math.ceil(speed_print * 35 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..f845c7b5da --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.15mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +speed_print = 70 +speed_topbottom = =math.ceil(speed_print * 35 / 70) +speed_wall = =math.ceil(speed_print * 45 / 70) +speed_wall_0 = =math.ceil(speed_wall * 35 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..34fe163ba4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.1mm.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..0117c1d11f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.2mm.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +acceleration_wall = 2000 +acceleration_wall_0 = 2000 +infill_sparse_density = 15 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 5 +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +speed_topbottom = =math.ceil(speed_print * 40 / 70) +speed_wall = =math.ceil(speed_print * 55 / 70) +speed_wall_0 = =math.ceil(speed_wall * 45 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..f9cf405e19 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pla_0.3mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +acceleration_print = 2000 +acceleration_topbottom = 1000 +acceleration_wall = 1500 +acceleration_wall_0 = 1000 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +speed_print = 50 +speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.9 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.15mm.inst.cfg new file mode 100644 index 0000000000..2b1e0b809b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.15mm.inst.cfg @@ -0,0 +1,46 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pp +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +multiple_mesh_overlap = 0 +prime_tower_enable = False +prime_tower_size = 16 +prime_tower_wipe_enabled = True +retraction_count_max = 15 +retraction_extra_prime_amount = 0.8 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 25 / 25) +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +top_bottom_thickness = 1.1 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.1mm.inst.cfg new file mode 100644 index 0000000000..f28737c1fb --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.1mm.inst.cfg @@ -0,0 +1,47 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pp +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 2 +multiple_mesh_overlap = 0 +prime_tower_enable = False +prime_tower_size = 16 +prime_tower_wipe_enabled = True +retraction_count_max = 15 +retraction_extra_prime_amount = 0.8 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 25 / 25) +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +top_bottom_thickness = 1 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.2mm.inst.cfg new file mode 100644 index 0000000000..c66275a066 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_pp_0.2mm.inst.cfg @@ -0,0 +1,46 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pp +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +brim_width = 20 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature + 8 +multiple_mesh_overlap = 0 +prime_tower_enable = False +prime_tower_size = 16 +prime_tower_wipe_enabled = True +retraction_count_max = 15 +retraction_extra_prime_amount = 0.8 +retraction_hop = 2 +retraction_hop_only_when_collides = True +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 25 / 25) +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.06mm.inst.cfg new file mode 100644 index 0000000000..5fc7213ed9 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.06mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..520423af81 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.15mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..877e4b7f4a --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.1mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..b92154644b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.2mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = False +retraction_prime_speed = =retraction_speed +speed_print = 50 +speed_roofing = =math.ceil(speed_wall * 20 / 24) +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 36 / 50) +speed_wall_0 = =math.ceil(speed_print * 26 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..b08df18bff --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tough-pla_0.3mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +acceleration_print = 2000 +acceleration_topbottom = 1000 +acceleration_wall = 1500 +acceleration_wall_0 = 1000 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 5 +prime_tower_enable = False +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +speed_print = 50 +speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.15mm.inst.cfg new file mode 100644 index 0000000000..bf4f00a2b6 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.15mm.inst.cfg @@ -0,0 +1,53 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tpu +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 +brim_width = 8.75 +gradual_infill_step_height = =5 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' +infill_sparse_density = 10 +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.5 +machine_nozzle_heat_up_speed = 2.5 +material_final_print_temperature = =material_print_temperature - 10 +material_flow = 106 +material_initial_print_temperature = =material_print_temperature - 10 +multiple_mesh_overlap = 0 +prime_tower_wipe_enabled = True +retraction_count_max = 15 +retraction_extra_prime_amount = 0.8 +retraction_hop_only_when_collides = True +skin_line_width = =round(line_width / 0.8, 2) +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 0.8) +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +top_bottom_thickness = =layer_height * 6 +travel_avoid_distance = 1.5 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.1mm.inst.cfg new file mode 100644 index 0000000000..0bd1131f67 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.1mm.inst.cfg @@ -0,0 +1,54 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tpu +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 +brim_width = 8.75 +gradual_infill_step_height = =5 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' +infill_sparse_density = 10 +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.5 +machine_nozzle_heat_up_speed = 2.5 +material_final_print_temperature = =material_print_temperature - 10 +material_flow = 106 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 2 +multiple_mesh_overlap = 0 +prime_tower_wipe_enabled = True +retraction_count_max = 15 +retraction_extra_prime_amount = 0.8 +retraction_hop_only_when_collides = True +skin_line_width = =round(line_width / 0.8, 2) +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 0.8) +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +top_bottom_thickness = =layer_height * 6 +travel_avoid_distance = 1.5 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.2mm.inst.cfg new file mode 100644 index 0000000000..6194d289ca --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_tpu_0.2mm.inst.cfg @@ -0,0 +1,53 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tpu +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 +brim_width = 8.75 +gradual_infill_step_height = =5 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' +infill_sparse_density = 10 +infill_wipe_dist = 0.1 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.5 +machine_nozzle_heat_up_speed = 2.5 +material_final_print_temperature = =material_print_temperature - 10 +material_flow = 106 +material_initial_print_temperature = =material_print_temperature - 10 +multiple_mesh_overlap = 0 +prime_tower_wipe_enabled = True +retraction_count_max = 15 +retraction_extra_prime_amount = 0.8 +retraction_hop_only_when_collides = True +skin_line_width = =round(line_width / 0.8, 2) +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 0.8) +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 35 +top_bottom_thickness = =layer_height * 6 +travel_avoid_distance = 1.5 +wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.06mm.inst.cfg new file mode 100644 index 0000000000..fc8817845e --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.06mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_max_flowrate = 20 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.15 +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm.inst.cfg new file mode 100644 index 0000000000..792a85cef9 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.15mm.inst.cfg @@ -0,0 +1,74 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_max_flowrate = 20 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.15 +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm.inst.cfg new file mode 100644 index 0000000000..2fa443ed00 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.1mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_max_flowrate = 20 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.15 +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm.inst.cfg new file mode 100644 index 0000000000..62060a8420 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.2mm.inst.cfg @@ -0,0 +1,79 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_material_flow = =1.05 * material_flow +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_max_flowrate = 20 +material_print_temperature = =default_material_print_temperature + 5 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.15 +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 45 +skin_material_flow = =material_flow +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_x_material_flow = =1.05 * wall_material_flow +wall_x_material_flow_roofing = =wall_material_flow +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.3mm.inst.cfg new file mode 100644 index 0000000000..7a7b25a4cb --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-abs_0.3mm.inst.cfg @@ -0,0 +1,76 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_max_flowrate = 20 +material_print_temperature = =default_material_print_temperature + 7 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.15 +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.4 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.06mm.inst.cfg new file mode 100644 index 0000000000..fa26b70e6f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.06mm.inst.cfg @@ -0,0 +1,72 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 20 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = False +retraction_amount = 8 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm.inst.cfg new file mode 100644 index 0000000000..548c6face8 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.15mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 20 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +retraction_amount = 8 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm.inst.cfg new file mode 100644 index 0000000000..b7506186a8 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.1mm.inst.cfg @@ -0,0 +1,72 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 20 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = False +retraction_amount = 8 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm.inst.cfg new file mode 100644 index 0000000000..e96a06481d --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.2mm.inst.cfg @@ -0,0 +1,78 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_material_flow = =1.1 * material_flow +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 20 +material_print_temperature = =default_material_print_temperature + 5 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +retraction_amount = 8 +retraction_prime_speed = 15 +retraction_speed = 45 +skin_material_flow = =1.05 * material_flow +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_x_material_flow = =1.1 * wall_material_flow +wall_x_material_flow_roofing = =wall_material_flow +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.3mm.inst.cfg new file mode 100644 index 0000000000..12031f052d --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-petg_0.3mm.inst.cfg @@ -0,0 +1,75 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 20 +material_print_temperature = =default_material_print_temperature + 5 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +retraction_amount = 8 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.4 +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.06mm.inst.cfg new file mode 100644 index 0000000000..22e1f168bd --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.06mm.inst.cfg @@ -0,0 +1,72 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 12 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..68522949bb --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.15mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 12 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..00e57ac8ad --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.1mm.inst.cfg @@ -0,0 +1,72 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 12 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..bbe63e6547 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.2mm.inst.cfg @@ -0,0 +1,78 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_material_flow = =1.1 * material_flow +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 12 +material_print_temperature = =default_material_print_temperature + 5 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +skin_material_flow = =1.05 * material_flow +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_x_material_flow = =1.1 * wall_material_flow +wall_x_material_flow_roofing = =wall_material_flow +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..bb37e746de --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-pla_0.3mm.inst.cfg @@ -0,0 +1,75 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 12 +material_print_temperature = =default_material_print_temperature + 10 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.06mm.inst.cfg new file mode 100644 index 0000000000..54f84ccfea --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.06mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = high +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 14 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..ac332b3b1c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.15mm.inst.cfg @@ -0,0 +1,74 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = fast +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 14 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.35 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm.inst.cfg new file mode 100644 index 0000000000..3f0bfcca9f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.1mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = normal +setting_version = 25 +type = quality +variant = AA 0.4 +weight = 0 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 14 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(20/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.3 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..d5d57fe1ff --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.2mm.inst.cfg @@ -0,0 +1,78 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_material_flow = =1.1 * material_flow +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 14 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +skin_material_flow = =1.05 * material_flow +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.35 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_x_material_flow = =1.1 * wall_material_flow +wall_x_material_flow_roofing = =wall_material_flow +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..ae7e38357d --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.4_um-tough-pla_0.3mm.inst.cfg @@ -0,0 +1,76 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.4 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_max_flowrate = 14 +material_print_temperature = =default_material_print_temperature + 5 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = False +raft_airgap = 0.25 +retraction_amount = 6.5 +retraction_prime_speed = =retraction_speed +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_structure = tree +support_top_distance = =support_z_distance +support_z_distance = 0.4 +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.2mm.inst.cfg new file mode 100644 index 0000000000..ef02c2742b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.2mm.inst.cfg @@ -0,0 +1,21 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +material_print_temperature = =default_material_print_temperature + 5 +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.3mm.inst.cfg new file mode 100644 index 0000000000..6c8a2116d4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.3mm.inst.cfg @@ -0,0 +1,21 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +material_print_temperature = =default_material_print_temperature + 7 +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.4mm.inst.cfg new file mode 100644 index 0000000000..2bfdd789f4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_abs_0.4mm.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_abs +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +material_print_temperature = =default_material_print_temperature + 10 +speed_infill = =math.ceil(speed_print * 37 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 37 / 50) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.2mm.inst.cfg new file mode 100644 index 0000000000..5cc671bee1 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.2mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +brim_width = 14 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 20 +prime_tower_enable = True +retraction_hop = 0.1 +retraction_hop_enabled = False +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 35 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +support_z_distance = =layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.3mm.inst.cfg new file mode 100644 index 0000000000..7d9410d7a1 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.3mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +brim_width = 14 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 17 +prime_tower_enable = True +retraction_hop = 0.1 +retraction_hop_enabled = False +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 35 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +support_z_distance = =layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.4mm.inst.cfg new file mode 100644 index 0000000000..2d4ec5adff --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe-plus_0.4mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +brim_width = 14 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 15 +prime_tower_enable = True +retraction_hop = 0.1 +retraction_hop_enabled = False +speed_infill = =math.ceil(speed_print * 40 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 35 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +support_z_distance = =layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..8456ae263d --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.2mm.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +brim_width = 15 +material_print_temperature = =default_material_print_temperature + 10 +prime_tower_enable = True +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.3mm.inst.cfg new file mode 100644 index 0000000000..4b457799d9 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.3mm.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +brim_width = 15 +material_print_temperature = =default_material_print_temperature + 12 +prime_tower_enable = True +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.4mm.inst.cfg new file mode 100644 index 0000000000..26f39bc06b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_cpe_0.4mm.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cpe +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +brim_width = 15 +material_print_temperature = =default_material_print_temperature + 15 +prime_tower_enable = True +speed_infill = =math.ceil(speed_print * 33 / 45) +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall = =math.ceil(speed_print * 33 / 45) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.2mm.inst.cfg new file mode 100644 index 0000000000..7efae3275d --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.2mm.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +brim_width = 5.6 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 5 +ooze_shield_angle = 40 +prime_tower_enable = True +raft_airgap = 0.45 +support_angle = 70 +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.3mm.inst.cfg new file mode 100644 index 0000000000..09def251bc --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.3mm.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +brim_width = 5.6 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 5 +ooze_shield_angle = 40 +prime_tower_enable = True +raft_airgap = 0.45 +support_angle = 70 +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.4mm.inst.cfg new file mode 100644 index 0000000000..c397dc68bb --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_nylon_0.4mm.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +brim_width = 5.6 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = =default_material_print_temperature - 5 +ooze_shield_angle = 40 +prime_tower_enable = True +raft_airgap = 0.45 +support_angle = 70 +switch_extruder_prime_speed = 30 +switch_extruder_retraction_amount = 30 +switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.2mm.inst.cfg new file mode 100644 index 0000000000..228bc2f503 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.2mm.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +brim_width = 14 +material_print_temperature = =default_material_print_temperature - 15 +raft_airgap = 0.5 +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.3mm.inst.cfg new file mode 100644 index 0000000000..b01b92131f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.3mm.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +brim_width = 14 +material_print_temperature = =default_material_print_temperature - 12 +raft_airgap = 0.5 +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 40 / 50) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.4mm.inst.cfg new file mode 100644 index 0000000000..e3ae0b0aa6 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pc_0.4mm.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pc +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +brim_width = 14 +material_print_temperature = =default_material_print_temperature - 10 +raft_airgap = 0.5 +speed_infill = =math.ceil(speed_print * 37 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 25 / 50) +speed_wall = =math.ceil(speed_print * 37 / 50) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.2mm.inst.cfg new file mode 100644 index 0000000000..adce55c055 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.2mm.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +brim_width = 7 +cool_fan_speed = 20 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = True +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.3mm.inst.cfg new file mode 100644 index 0000000000..a1a37f01e6 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.3mm.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +brim_width = 7 +cool_fan_speed = 20 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = True +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.4mm.inst.cfg new file mode 100644 index 0000000000..569fe071a6 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_petg_0.4mm.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petg +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +brim_width = 7 +cool_fan_speed = 20 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = True +speed_infill = =math.ceil(speed_print * 33 / 45) +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall = =math.ceil(speed_print * 33 / 45) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..d5fbd68d8f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.2mm.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +gradual_infill_step_height = =3 * layer_height +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..a08b04225b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.3mm.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +gradual_infill_step_height = =3 * layer_height +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.4mm.inst.cfg new file mode 100644 index 0000000000..76409e2ab7 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pla_0.4mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +gradual_infill_step_height = =3 * layer_height +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 15 +speed_infill = =math.ceil(speed_print * 35 / 45) +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 35 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.2mm.inst.cfg new file mode 100644 index 0000000000..25181ed212 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.2mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pp +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +brim_width = 25 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature + 11 +multiple_mesh_overlap = 0.2 +prime_tower_enable = True +prime_tower_flow = 100 +prime_tower_min_volume = 10 +retraction_count_max = 15 +retraction_extra_prime_amount = 0.5 +retraction_hop = 0.5 +retraction_prime_speed = 15 +speed_wall_x = =math.ceil(speed_wall * 30 / 30) +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 45 +top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 +wall_0_wipe_dist = =line_width * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.3mm.inst.cfg new file mode 100644 index 0000000000..9de73f17e4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.3mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pp +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +brim_width = 25 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature + 13 +multiple_mesh_overlap = 0.2 +prime_tower_enable = True +prime_tower_flow = 100 +prime_tower_min_volume = 15 +retraction_count_max = 15 +retraction_extra_prime_amount = 0.5 +retraction_hop = 0.5 +retraction_prime_speed = 15 +speed_wall_x = =math.ceil(speed_wall * 30 / 30) +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 45 +top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 +wall_0_wipe_dist = =line_width * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.4mm.inst.cfg new file mode 100644 index 0000000000..d1fc3befcb --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_pp_0.4mm.inst.cfg @@ -0,0 +1,37 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pp +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +brim_width = 25 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature + 15 +multiple_mesh_overlap = 0.2 +prime_tower_enable = True +prime_tower_flow = 100 +prime_tower_min_volume = 20 +retraction_count_max = 15 +retraction_extra_prime_amount = 0.5 +retraction_hop = 0.5 +retraction_prime_speed = 15 +speed_infill = =math.ceil(speed_wall * 30 / 30) +speed_wall_x = =math.ceil(speed_wall * 30 / 30) +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 45 +top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 +wall_0_wipe_dist = =line_width * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..212cd93a0f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +prime_tower_enable = False +speed_print = 45 +speed_topbottom = =round(speed_print * 35 / 45) +speed_wall = =round(speed_print * 40 / 45) +speed_wall_0 = =round(speed_print * 35 / 45) +support_angle = 70 +top_bottom_thickness = =layer_height * 6 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..bf2d6771e7 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.3mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 15 +prime_tower_enable = False +speed_infill = =math.ceil(speed_print * 30 / 35) +speed_print = 35 +speed_topbottom = =math.ceil(speed_print * 20 / 35) +speed_wall = =math.ceil(speed_print * 25 / 35) +speed_wall_0 = =math.ceil(speed_print * 20 / 35) +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.4mm.inst.cfg new file mode 100644 index 0000000000..3c9e3aea18 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_tough-pla_0.4mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tough_pla +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 15 +prime_tower_enable = False +speed_infill = =math.ceil(speed_print * 30 / 30) +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 20 / 30) +speed_wall = =math.ceil(speed_print * 25 / 30) +speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.2mm.inst.cfg new file mode 100644 index 0000000000..41f3d6c7cc --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.2mm.inst.cfg @@ -0,0 +1,49 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tpu +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 +brim_width = 8.75 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' +machine_nozzle_cool_down_speed = 0.5 +machine_nozzle_heat_up_speed = 2.5 +material_final_print_temperature = =material_print_temperature - 10 +material_flow = 105 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 4 +multiple_mesh_overlap = 0.2 +prime_tower_enable = True +prime_tower_flow = 100 +retraction_count_max = 15 +retraction_extra_prime_amount = 0.5 +retraction_hop = 1.5 +retraction_hop_only_when_collides = False +retraction_prime_speed = 15 +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 25 / 30) +speed_wall = =math.ceil(speed_print * 30 / 30) +speed_wall_x = =math.ceil(speed_wall * 30 / 30) +support_angle = 50 +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 45 +top_bottom_thickness = =layer_height * 6 +top_skin_expand_distance = =line_width * 2 +travel_avoid_distance = 1.5 +wall_0_wipe_dist = =line_width * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.3mm.inst.cfg new file mode 100644 index 0000000000..35e8215b4c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.3mm.inst.cfg @@ -0,0 +1,50 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tpu +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 +brim_width = 8.75 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' +infill_sparse_density = 15 +machine_nozzle_cool_down_speed = 0.5 +machine_nozzle_heat_up_speed = 2.5 +material_final_print_temperature = =material_print_temperature - 10 +material_flow = 105 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 2 +multiple_mesh_overlap = 0.2 +prime_tower_enable = True +prime_tower_flow = 100 +retraction_count_max = 15 +retraction_extra_prime_amount = 0.5 +retraction_hop = 1.5 +retraction_hop_only_when_collides = False +retraction_prime_speed = 15 +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 23 / 30) +speed_wall = =math.ceil(speed_print * 30 / 30) +speed_wall_x = =math.ceil(speed_wall * 30 / 30) +support_angle = 50 +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 45 +top_bottom_thickness = =layer_height * 6 +top_skin_expand_distance = =line_width * 2 +travel_avoid_distance = 1.5 +wall_0_wipe_dist = =line_width * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.4mm.inst.cfg new file mode 100644 index 0000000000..3fe5aa3d0c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_tpu_0.4mm.inst.cfg @@ -0,0 +1,49 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_tpu +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 +brim_width = 8.75 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' +infill_sparse_density = 15 +machine_nozzle_cool_down_speed = 0.5 +machine_nozzle_heat_up_speed = 2.5 +material_final_print_temperature = =material_print_temperature - 10 +material_flow = 105 +material_initial_print_temperature = =material_print_temperature - 10 +multiple_mesh_overlap = 0.2 +prime_tower_enable = True +prime_tower_flow = 100 +retraction_count_max = 15 +retraction_extra_prime_amount = 0.5 +retraction_hop = 1.5 +retraction_hop_only_when_collides = False +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 20 / 30) +speed_wall = =speed_print +speed_wall_x = =speed_print +support_angle = 50 +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 20 +switch_extruder_retraction_speeds = 45 +top_bottom_thickness = =layer_height * 6 +top_skin_expand_distance = =line_width * 2 +travel_avoid_distance = 1.5 +wall_0_wipe_dist = =line_width * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm.inst.cfg new file mode 100644 index 0000000000..107982eb08 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.2mm.inst.cfg @@ -0,0 +1,76 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = 200 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_flow = 93 +material_max_flowrate = 22 +material_print_temperature = =default_material_print_temperature + 5 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = True +raft_airgap = 0.15 +retraction_amount = 4 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.3mm.inst.cfg new file mode 100644 index 0000000000..e673c82752 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.3mm.inst.cfg @@ -0,0 +1,74 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_flow = 93 +material_max_flowrate = 22 +material_print_temperature = =default_material_print_temperature + 7 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = True +raft_airgap = 0.15 +retraction_amount = 4 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 75 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/75)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.4mm.inst.cfg new file mode 100644 index 0000000000..53e9670af5 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-abs_0.4mm.inst.cfg @@ -0,0 +1,74 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_abs +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.8 +material_flow = 93 +material_max_flowrate = 22 +material_print_temperature = =default_material_print_temperature + 10 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = True +raft_airgap = 0.15 +retraction_amount = 4 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/50)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm.inst.cfg new file mode 100644 index 0000000000..128761c72b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.2mm.inst.cfg @@ -0,0 +1,75 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = 200 +bridge_wall_speed = 20 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 23 +material_print_temperature = =default_material_print_temperature - 5 +max_flow_acceleration = 1 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = True +retraction_amount = 3.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.3mm.inst.cfg new file mode 100644 index 0000000000..308a923d10 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.3mm.inst.cfg @@ -0,0 +1,75 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_material_flow = 100 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = 100 +bridge_wall_speed = 20 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 23 +material_print_temperature = =default_material_print_temperature - 5 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = True +retraction_amount = 3.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 75 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/75)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.4mm.inst.cfg new file mode 100644 index 0000000000..a2116cbb18 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-petg_0.4mm.inst.cfg @@ -0,0 +1,75 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_petg +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_material_flow = 100 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = 100 +bridge_wall_speed = 20 +cool_min_layer_time = 4 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.4 +machine_nozzle_heat_up_speed = 1.7 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 23 +material_print_temperature = =default_material_print_temperature - 5 +max_flow_acceleration = 1 +optimize_wall_printing_order = False +prime_tower_enable = True +retraction_amount = 3.5 +retraction_prime_speed = 15 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 50 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/50)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1.2 , layer_height * 6) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..d896a9de0d --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.2mm.inst.cfg @@ -0,0 +1,75 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = 200 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 15 +material_print_temperature = =default_material_print_temperature + 10 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 4 +retraction_prime_speed = 22 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..7bf986cc93 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.3mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 15 +material_print_temperature = =default_material_print_temperature + 10 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 4 +retraction_prime_speed = 22 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 65 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/65)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.4mm.inst.cfg new file mode 100644 index 0000000000..51324ae009 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-pla_0.4mm.inst.cfg @@ -0,0 +1,73 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 15 +material_print_temperature = =default_material_print_temperature + 15 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +raft_airgap = 0.25 +retraction_amount = 4 +retraction_prime_speed = 22 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 30 +speed_prime_tower = =speed_wall_0 +speed_print = 45 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/45)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..9f1abda07e --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.2mm.inst.cfg @@ -0,0 +1,76 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = draft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -2 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = 200 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 17 +material_print_temperature = =default_material_print_temperature + 10 +max_flow_acceleration = 2 +meshfix_maximum_resolution = 0.7 +optimize_wall_printing_order = False +prime_tower_enable = True +raft_airgap = 0.25 +retraction_amount = 4 +retraction_prime_speed = 22 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 100 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/100)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.3mm.inst.cfg new file mode 100644 index 0000000000..f973058272 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.3mm.inst.cfg @@ -0,0 +1,74 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = verydraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -3 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 17 +material_print_temperature = =default_material_print_temperature + 15 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +prime_tower_enable = True +raft_airgap = 0.25 +retraction_amount = 4 +retraction_prime_speed = 22 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 65 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/65)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.4mm.inst.cfg new file mode 100644 index 0000000000..ea703b5dfa --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa0.8_um-tough-pla_0.4mm.inst.cfg @@ -0,0 +1,74 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla +quality_type = superdraft +setting_version = 25 +type = quality +variant = AA 0.8 +weight = -4 + +[values] +acceleration_infill = =acceleration_print +acceleration_ironing = 1000 +acceleration_layer_0 = =acceleration_wall_0 +acceleration_print = 3500 +acceleration_roofing = =acceleration_wall_0 +acceleration_topbottom = =acceleration_wall +acceleration_wall = =acceleration_infill +acceleration_wall_0 = 1500 +acceleration_wall_x = =acceleration_wall +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_speed = 30 +cool_min_layer_time = 6 +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = True +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +infill_sparse_density = 15 +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_wall_0 +jerk_print = =max(30, speed_print/2) * 200 +jerk_roofing = =jerk_wall_0 +jerk_topbottom = =jerk_wall +jerk_wall = =jerk_infill +jerk_wall_0 = =max(30, speed_wall_0/2) * 200 +machine_nozzle_cool_down_speed = 1.3 +machine_nozzle_heat_up_speed = 1.9 +material_extrusion_cool_down_speed = 0.7 +material_flow = 93 +material_max_flowrate = 17 +material_print_temperature = =default_material_print_temperature + 15 +max_flow_acceleration = 2 +optimize_wall_printing_order = False +prime_tower_enable = True +raft_airgap = 0.25 +retraction_amount = 4 +retraction_prime_speed = 22 +retraction_speed = 45 +small_skin_on_surface = False +small_skin_width = 4 +speed_infill = =speed_print +speed_ironing = 20 +speed_layer_0 = 26 +speed_prime_tower = =speed_wall_0 +speed_print = 45 +speed_roofing = =math.ceil(speed_wall*(45/100)) +speed_support_interface = =speed_wall_0 +speed_topbottom = =speed_print +speed_wall = =speed_infill +speed_wall_0 = =math.ceil(speed_wall*(30/45)) +speed_wall_x = =speed_wall +speed_wall_x_roofing = =speed_roofing +support_angle = 70 +support_interface_enable = False +support_structure = tree +top_bottom_thickness = =max(1 , layer_height * 5) +wall_0_wipe_dist = 0.8 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) +zig_zaggify_infill = True + diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg index cc5e850220..dcb79ffbee 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg @@ -15,9 +15,14 @@ weight = -2 cool_min_layer_time = 4 cool_min_layer_time_fan_speed_max = 9 cool_min_temperature = =material_print_temperature - 20 +hole_xy_offset = 0.1 +inset_direction = inside_out retraction_prime_speed = 15 +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 support_structure = tree wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg index 9abcd5ddd2..fd3942a782 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg @@ -13,9 +13,14 @@ weight = -2 [values] cool_min_layer_time = 4 +hole_xy_offset = 0.1 +inset_direction = inside_out material_print_temperature = =default_material_print_temperature + 5 retraction_prime_speed = 15 +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg index 9feab61e0e..3807598f26 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg @@ -13,11 +13,16 @@ weight = -1 [values] cool_min_temperature = =material_print_temperature - 20 +hole_xy_offset = 0.1 +inset_direction = inside_out material_final_print_temperature = =material_print_temperature - 15 material_initial_print_temperature = =material_print_temperature - 15 retraction_prime_speed = =retraction_speed +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 support_structure = tree wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg index 8431bb9c43..c047ded9c3 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg @@ -13,12 +13,17 @@ weight = 0 [values] cool_min_temperature = =material_print_temperature - 20 +hole_xy_offset = 0.1 +inset_direction = inside_out material_final_print_temperature = =material_print_temperature - 15 material_initial_print_temperature = =material_print_temperature - 15 retraction_prime_speed = =retraction_speed +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 support_structure = tree top_bottom_thickness = =round(6*layer_height,3) wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg index 7a5d19dc2c..580f05d0b7 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg @@ -13,11 +13,16 @@ weight = -2 [values] cool_min_temperature = =material_print_temperature - 20 +hole_xy_offset = 0.1 +inset_direction = inside_out material_final_print_temperature = =material_print_temperature - 15 material_initial_print_temperature = =material_print_temperature - 15 retraction_prime_speed = =retraction_speed +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 support_structure = tree wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg index f17d3fde40..06d3c93cf3 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg @@ -13,10 +13,15 @@ weight = -1 [values] cool_min_temperature = =material_print_temperature - 20 +hole_xy_offset = 0.1 +inset_direction = inside_out retraction_prime_speed = =retraction_speed retraction_speed = 25 +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 support_structure = tree wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg index 672eae3e4a..6099457369 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg @@ -13,10 +13,15 @@ weight = 0 [values] cool_min_temperature = =material_print_temperature - 20 +hole_xy_offset = 0.1 +inset_direction = inside_out retraction_prime_speed = =retraction_speed +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 support_structure = tree top_bottom_thickness = =round(6*layer_height,3) wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg index 716765aac5..373fa7b78e 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg @@ -13,9 +13,14 @@ weight = -2 [values] cool_min_temperature = =material_print_temperature - 20 +hole_xy_offset = 0.1 +inset_direction = inside_out retraction_prime_speed = =retraction_speed +speed_roofing = =speed_topbottom * 1/3 speed_wall_x = =speed_wall speed_wall_x_roofing = =speed_wall * 0.8 support_structure = tree wall_line_width_x = =wall_line_width * 1.25 +wall_thickness = =wall_line_width_0 + 2*wall_line_width_x +xy_offset = 0.025 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.15mm.inst.cfg new file mode 100644 index 0000000000..e10db6b743 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.15mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s8 +name = Normal +version = 4 + +[metadata] +material = generic_bvoh +quality_type = fast +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -1 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 4000 +jerk_support = 4000 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = =2 * layer_height +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.1mm.inst.cfg new file mode 100644 index 0000000000..9c5d0e9bd8 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.1mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s8 +name = Fine +version = 4 + +[metadata] +material = generic_bvoh +quality_type = normal +setting_version = 25 +type = quality +variant = BB 0.4 +weight = 0 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 4000 +jerk_support = 4000 +material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = =2 * layer_height +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..8f4c52d7b5 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.2mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s8 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -2 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 4000 +jerk_support = 4000 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..e37500de1a --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bvoh_0.3mm.inst.cfg @@ -0,0 +1,37 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.4 +weight = -3 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 4000 +jerk_support = 4000 +material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = 0.3 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.06mm.inst.cfg new file mode 100644 index 0000000000..2040977dee --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.06mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Extra Fine - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pva +quality_type = high +setting_version = 25 +type = quality +variant = BB 0.4 +weight = 1 + +[values] +acceleration_prime_tower = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +initial_layer_line_width_factor = 150 +material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 +support_infill_sparse_thickness = =3 * layer_height +support_interface_enable = True + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.2mm.inst.cfg new file mode 100644 index 0000000000..9a8e2a51c4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.2mm.inst.cfg @@ -0,0 +1,34 @@ +[general] +definition = ultimaker_s8 +name = Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -2 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 4000 +jerk_support = 4000 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.3mm.inst.cfg new file mode 100644 index 0000000000..f325937cb9 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.3mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast +version = 4 + +[metadata] +material = generic_bvoh +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -3 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 4000 +jerk_support = 4000 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_infill_sparse_thickness = 0.3 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.4mm.inst.cfg new file mode 100644 index 0000000000..e26028fdc1 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.8_bvoh_0.4mm.inst.cfg @@ -0,0 +1,35 @@ +[general] +definition = ultimaker_s8 +name = Sprint +version = 4 + +[metadata] +material = generic_bvoh +quality_type = superdraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -4 + +[values] +acceleration_prime_tower = 1500 +acceleration_support = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +initial_layer_line_width_factor = 150 +jerk_prime_tower = 4000 +jerk_support = 4000 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_amount = 6.5 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 50 +speed_support = 50 +speed_support_interface = 50 +support_bottom_density = 70 +support_interface_enable = True +support_z_distance = 0 + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.2mm.inst.cfg new file mode 100644 index 0000000000..b2d35e13f0 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pva +quality_type = draft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -2 + +[values] +acceleration_prime_tower = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 +support_interface_enable = True + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.3mm.inst.cfg new file mode 100644 index 0000000000..7578c4096d --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.3mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pva +quality_type = verydraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -3 + +[values] +acceleration_prime_tower = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +initial_layer_line_width_factor = 150 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 +support_infill_sparse_thickness = 0.3 +support_interface_enable = True + diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.4mm.inst.cfg new file mode 100644 index 0000000000..8dea83fa39 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_bb0.8_pva_0.4mm.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = ultimaker_s8 +name = Sprint - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pva +quality_type = superdraft +setting_version = 25 +type = quality +variant = BB 0.8 +weight = -4 + +[values] +acceleration_prime_tower = 1500 +brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 +initial_layer_line_width_factor = 150 +material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 +retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 +support_interface_enable = True + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_cffcpe_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffcpe_0.15mm.inst.cfg new file mode 100644 index 0000000000..4d422d76a6 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffcpe_0.15mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cffcpe +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -1 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..7f30c1b7c4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cffcpe +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_cffpa_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffpa_0.15mm.inst.cfg new file mode 100644 index 0000000000..64c307dd25 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffpa_0.15mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cffpa +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -1 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_cffpa_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffpa_0.2mm.inst.cfg new file mode 100644 index 0000000000..4575c84751 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_cffpa_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cffpa +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_gffcpe_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffcpe_0.15mm.inst.cfg new file mode 100644 index 0000000000..ca1911acb7 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffcpe_0.15mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_gffcpe +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -1 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..7a8b75efa4 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_gffcpe +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_gffpa_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffpa_0.15mm.inst.cfg new file mode 100644 index 0000000000..579902719c --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffpa_0.15mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_gffpa +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -1 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_gffpa_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffpa_0.2mm.inst.cfg new file mode 100644 index 0000000000..489b6e6481 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_gffpa_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_gffpa +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_nylon-cf-slide_0.2mm.inst.cfg new file mode 100644 index 0000000000..e6f862155f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_nylon-cf-slide_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon-cf-slide +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm.inst.cfg new file mode 100644 index 0000000000..f39cf8d8dc --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_petcf_0.15mm.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petcf +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -1 + +[values] +cool_fan_speed_max = =cool_fan_speed +infill_overlap = =0 if infill_sparse_density > 80 else 10 +raft_airgap = =layer_height * 2 +skin_overlap = 20 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm.inst.cfg new file mode 100644 index 0000000000..af30aa4fda --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_petcf_0.2mm.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petcf +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +cool_fan_speed_max = =cool_fan_speed +infill_overlap = =0 if infill_sparse_density > 80 else 10 +raft_airgap = =layer_height * 2 +skin_overlap = 20 +speed_infill = =speed_print +speed_print = 25 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..d938e7f172 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_pla_0.15mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -1 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..83fa334dc2 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_pla_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_um-pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..787197e7c6 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_um-pla_0.15mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -1 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.4_um-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..460ccb8d1f --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.4_um-pla_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..d42782179a --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cffcpe +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_cffpa_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_cffpa_0.2mm.inst.cfg new file mode 100644 index 0000000000..d4d5e62b24 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_cffpa_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_cffpa +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..53863e8eeb --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_gffcpe +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_gffpa_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_gffpa_0.2mm.inst.cfg new file mode 100644 index 0000000000..e738c1b90b --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_gffpa_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_gffpa +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_nylon-cf-slide_0.2mm.inst.cfg new file mode 100644 index 0000000000..a2301d9f6e --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_nylon-cf-slide_0.2mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_nylon-cf-slide +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm.inst.cfg new file mode 100644 index 0000000000..2f1c6808f7 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.15mm.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petcf +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -1 + +[values] +cool_fan_speed_max = =cool_fan_speed +infill_overlap = =0 if infill_sparse_density > 80 else 10 +raft_airgap = =layer_height * 2 +skin_overlap = 20 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm.inst.cfg new file mode 100644 index 0000000000..17266d22e1 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.2mm.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petcf +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +cool_fan_speed_max = =cool_fan_speed +infill_overlap = =0 if infill_sparse_density > 80 else 10 +raft_airgap = =layer_height * 2 +skin_overlap = 20 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.3mm.inst.cfg new file mode 100644 index 0000000000..b9aa45a9a3 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_petcf_0.3mm.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = ultimaker_s8 +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_petcf +quality_type = verydraft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -3 + +[values] +cool_fan_speed_max = =cool_fan_speed +infill_overlap = =0 if infill_sparse_density > 80 else 10 +raft_airgap = =layer_height * 2 +skin_overlap = 20 +speed_infill = =speed_print +speed_print = 30 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..f53ead83cb --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_pla_0.15mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -1 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..d9b570c843 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_pla_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = generic_pla +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_um-pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..2406339630 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_um-pla_0.15mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = fast +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -1 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc0.6_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc0.6_um-pla_0.2mm.inst.cfg new file mode 100644 index 0000000000..7f5c035509 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_cc0.6_um-pla_0.2mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_s8 +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla +quality_type = draft +setting_version = 25 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +gradual_infill_step_height = =3 * layer_height +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg index 5f3180ef4e..04249a0af3 100644 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg @@ -13,12 +13,41 @@ variant = CC+ 0.4 weight = -2 [values] +acceleration_roofing = =acceleration_topbottom/2 +bridge_enable_more_layers = True +bridge_skin_density = 70 bridge_skin_material_flow = 100 +bridge_skin_material_flow_2 = 70 bridge_skin_speed = 30 +bridge_skin_speed_2 = =speed_print*2/3 bridge_wall_material_flow = 100 +bridge_wall_min_length = 2 bridge_wall_speed = 30 +cool_min_layer_time = 6 cool_min_layer_time_fan_speed_max = 11 -retraction_prime_speed = 15 +cool_min_layer_time_overhang = 11 +cool_min_temperature = =material_print_temperature-10 +flooring_monotonic = False +infill_material_flow = =material_flow if infill_sparse_density < 95 else 95 +infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'grid' +jerk_roofing = =jerk_print +material_flow = 95 +retraction_hop_enabled = False +retraction_prime_speed = 25 +roofing_material_flow = =skin_material_flow +roofing_monotonic = False +skin_material_flow = =0.95*material_flow +skin_outline_count = 0 +support_bottom_distance = =support_z_distance support_structure = tree +support_tree_tip_diameter = 2.0 +support_tree_top_rate = 10 +support_xy_distance = 1.2 +support_xy_distance_overhang = =1.5*machine_nozzle_size +support_z_distance = =min(2*layer_height, 0.4) +top_bottom_thickness = =wall_thickness +wall_0_inset = =0.05 wall_overhang_speed_factors = [100,90,80,70,60,50] +wall_x_material_flow = =material_flow +xy_offset = 0.075 diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg index 3467ed5ded..664748835f 100644 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg @@ -13,12 +13,43 @@ variant = CC+ 0.4 weight = -2 [values] +acceleration_roofing = =acceleration_topbottom/2 adhesion_type = skirt +bridge_enable_more_layers = True +bridge_skin_density = 70 bridge_skin_material_flow = 100 +bridge_skin_material_flow_2 = 70 bridge_skin_speed = 30 +bridge_skin_speed_2 = =speed_print*2/3 bridge_wall_material_flow = 100 +bridge_wall_min_length = 2 bridge_wall_speed = 30 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = 11 +cool_min_temperature = =material_print_temperature-10 +flooring_monotonic = False +infill_material_flow = =material_flow if infill_sparse_density < 95 else 95 +infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'grid' +jerk_roofing = =jerk_print +material_pressure_advance_factor = 0.25 +retraction_hop_enabled = False +retraction_prime_speed = 15 +roofing_material_flow = =skin_material_flow +roofing_monotonic = False +skin_material_flow = =0.95*material_flow +skin_outline_count = 0 +skirt_height = 5 +support_bottom_distance = =support_z_distance support_structure = tree +support_tree_tip_diameter = 2.0 +support_tree_top_rate = 10 +support_xy_distance = 1.2 +support_xy_distance_overhang = =1.5*machine_nozzle_size +support_z_distance = =min(2*layer_height, 0.4) switch_extruder_retraction_amount = 16 +top_bottom_thickness = =wall_thickness +wall_0_inset = =0.05 wall_overhang_speed_factors = [100,90,80,70,60,50] +wall_x_material_flow = =material_flow +xy_offset = 0.075 diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg index e88b8d8308..577faaca43 100644 --- a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg @@ -13,4 +13,9 @@ variant = 0.4mm weight = -3 [values] +bridge_wall_speed = 40 +cool_min_layer_time_overhang = 12 +cool_min_speed = 40 +wall_overhang_angle = 30 +wall_overhang_speed_factors = [60] diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg index 7fe5437a80..a7e18af32d 100644 --- a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -12,4 +12,9 @@ variant = 0.4mm weight = -2 [values] +bridge_wall_speed = 40 +cool_min_layer_time_overhang = 12 +cool_min_speed = 40 +wall_overhang_angle = 30 +wall_overhang_speed_factors = [60] diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg index 1a78aff02e..472127d913 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg index 5b7b32b9cc..d26a94cc94 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg index 69a732338b..00cb76811a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg index f86d5dd456..7b8535ac29 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index 8415cf620f..7bb5181ef1 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index f196792e41..eb0762aae7 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index bd26606f8e..d661919e74 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index 9770e6c2d2..0fd9956649 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg index 01da20fc32..f268faf9e8 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg index 217a0ee958..176042ed66 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg index 1db8fd3cac..65986bc20a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg index a7386463ae..3bf3f10567 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg index 7d01a19fcc..610ff6bd43 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg index 3d1ee7703e..d58e6b671d 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg index 9ea04f256f..926c01f67c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg index ee26f7aeab..f1e00a852a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg index 365d9b1669..6b9b3cba94 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg index 86378c6349..ec8ac6f790 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg index 96dd2af207..171d636cf5 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg index 36009fd8fb..8a499988ac 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg index 6f794d3f3c..a7e7f8f0db 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg index 7474701118..15a3baf4fc 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg index 7f2e65bc23..1d45bf6950 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg index d5cfe39117..224ddc0f0a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index cfb94c2aa7..41084020b1 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index de909f571b..71f38df1d2 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 30cea3f2ab..a027f9b7e0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index 3cc351cee6..9937e03e25 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 1dc4fa73dd..7bfaeae654 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.25mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 300 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index dac83665b9..4f26c78231 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.25mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 180 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 8615d9c271..343f9a87a8 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.25mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 300 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 146103ce1b..10ea98d847 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.25mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 240 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg index fa9ee4781c..8508c6630b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg index 9d0b6aa70b..d02487602f 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg index d451bbec6e..f7928ca503 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg index 2354f131f9..1719053112 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index 29e51d7bce..cac2f9acb3 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index 8649570282..5381ff8fae 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 650fa85b8e..4d3e8d1765 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index 6636897c7d..6c2923e8a9 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg index 5c10b31844..f7845341ec 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg index ba515ca00b..e70c5bb64a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg index 4786a04864..bd33d56c50 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg index f7d959657b..d910585e57 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg index 1a8a810d67..06bd4d8653 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg index 5b12d1251a..1613e43acd 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg index 6ebea5cc38..95b2c160e3 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg index 3371b37777..e956cc0b63 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg index 80bd1a1b62..9c5d576f96 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg index d1394668b1..37b0b19e2a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg index 5e73449340..fbf6355334 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg index fde4bc54cf..d23f50f8bd 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg index 49c175afcf..af7d4565d1 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg index accb59e77e..a87dae9ff8 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg index 30b038271e..393c03d6cd 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg index ae1c2b6f25..2cffd20c3a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 4cbb072d75..0eea09c68f 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index 63d616a158..7a0baf1d51 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 2a2458b497..4ca8e634b7 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 61078c81d7..f236c1f64b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index d9d5794a7c..4623b039e1 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.30mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 300 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index b8c5491d0c..5093564c7d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.30mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 160 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 3d519ee822..e0431d44bf 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.30mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 300 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 9092aec6ae..d24c386863 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.30mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg index 4f6531196d..2b49e65d38 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg index aa06f4bcfd..dfa68fb352 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg index 91a1fea797..a4d985da7c 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index 3745a14da6..4769cedb86 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 950316f71c..f97f088e0a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 928eb529bc..f4fb7e901c 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg index d5375bb579..8e62a9b997 100644 --- a/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg index cffb953aa1..ec755f5376 100644 --- a/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg index b69a01bbab..21ecf2da70 100644 --- a/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg index a103e3db71..7badfaacc6 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg index 660cad4a91..8f9b182324 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg index b15f24867d..b6313835da 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg index e80adc02d8..4c3a70bdd4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg index c4e2d4a288..a3f29d7ba5 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg index e1fa2fbbeb..a2512deebd 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg index 1f0d0e6de0..72f6614130 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg index 48bfbb970e..7c852b05af 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg index 392a9e147c..afdf001653 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index 8f136d03a5..ad95615e35 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index ef9ab6dd85..1af176a977 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index f4b9071a50..0c3940496b 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 5faf7a02c6..1c568a5073 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.35mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 135 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 1960c196c3..8ddb0a909d 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.35mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 270 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index b6bfa2627b..02cdcf09fa 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.35mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 180 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg index 597b487ffc..95130e3252 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg index b51dfa571d..17eb6401d4 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg index e3fe57a286..36a067df13 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg index f42d06273c..9ddefed2af 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index bbf785154c..79fc1b6623 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 6fb864d16b..3e460bf2dd 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index 1165f9c3ac..1a43e97f0f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index 8c9af97019..a75010e83b 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg index e77797a36b..85e0ef1d03 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg index 7ace98e353..10d49be797 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg index a21fdfc2ac..b8f84e5509 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg index 37c677a2bd..73ffae9a4f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg index 1b77ab8bf0..1b14e91648 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg index bf6a2d9dd3..b487147448 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg index 0c52ee159b..d9a4478c72 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg index fb2430ce6c..6510d401df 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg index c87f140ec8..25b7143978 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg index 60c056d908..29d0c2eb4e 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg index 954758f95f..998224afcd 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg index c2b70fa70e..95883935d1 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg index 5034bac12d..c5fde081a8 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg index ee0a7d54d9..1d16f9e94d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg index ff91b47002..41a8bb526d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg index 807e9f7041..64ba6eae71 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index 495fb6548d..35a17ba293 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index 7bd1ba1de4..ac5d6e0702 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 0190d72da3..bb92b8a3de 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 51f1c55be2..e5f3128410 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 04cfb43677..4b2a20ad7c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.40mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 80 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 4317de6cfc..c086d396fb 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.40mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 120 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index c7eb79d79e..bade8d6b62 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.40mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 240 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index a6f0a26399..1707a3a44b 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.40mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 160 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg index c4ec51c8eb..6b2955dad9 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg index 47cb2a9afe..e4d1ce4fdc 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg index a25d0d13e8..caa7c01536 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg index 56f2155df8..88b7354b88 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index 0f0f84c860..4fe0d0a7e7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index 6ce4e5d0b3..c8611854eb 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index ebc1a318f6..1d01dabe86 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index e9b23f66a3..38a2fcb9f8 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg index df929b48db..9645cc0032 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg index f4e303736a..cbd3c36b4e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg index 431a1ece23..02f31684d7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg index 536f6f8631..1e39b900cf 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg index 5536bb9bd3..284fdba324 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg index a874db28c8..e033b0fd52 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg index 5333e2dcfa..e4829f87e7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg index f6bece73b0..25f4788e01 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg index 6d586fa75e..5849d03e9c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg index 5372651955..04aebd2197 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg index 6545d9ee0a..e15b4a35cd 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg index f009c2db4f..d715d4c88a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg index 2bb9b57826..81eebebfa3 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg index dd59f26db1..7edf2cf5e9 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg index 3063af1d32..c367ac8a12 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg index ebc966df27..ad8e358bb5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index 47fac16700..d0f9c188d6 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index f6d0ce97fe..d455a84bad 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index bedcab6681..1d1aafdd63 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index a141a2d95b..9e8a220ee2 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 45f006a547..4a9bd5cffd 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.50mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 49892d8a83..fd0d2d9072 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.50mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 90 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index a6a6992248..7f7a62cdf6 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.50mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 120 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index e95e90dd93..21f0c044d5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.50mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 45 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg index 91c22b872a..359ec1e4db 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg index fb77901f39..64b2a8d08c 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg index 3eda0c7106..9f904b2719 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index bcae35f5f3..de655307d8 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index 3dda1aa344..a2c99b0b14 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index f71dd3d097..ce28af819d 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg index 36f6b7056d..986751dca0 100644 --- a/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg index 3889a68b03..a259ec6a60 100644 --- a/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg index 9dea5768c9..b0ee1f7573 100644 --- a/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg index bb57cb6497..0bbc3c7af6 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg index cdd6bbe53b..3b58ca9887 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg index c74de15a43..d82098d589 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg index 8312763bd0..6d8999d929 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg index 6538937390..23f0d0099f 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg index f4ca021830..934c4d93ca 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg index 3563d1b72c..cfe79cf764 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg index ba045726e1..0d612d3f67 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg index e420d7e4eb..d1b900e3ee 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index a518244907..bd6850014d 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 32cc4a42ff..b9f4ae5029 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index 624e8fd9b7..11fbf80f82 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 472825f867..79dfea9e1b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.60mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 50 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index e51fed49e8..b29fd3721e 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.60mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 80 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index aca6743723..d70090434d 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.60mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg index 0c9df4d5bb..26489c6cea 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg index 5533336319..7964b7e62b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg index 4df7680b91..508d9ecf6b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 1fa6380203..197bb748fc 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 2b9e6eb31d..19e8b98b3b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index dfb0cbcff6..fe866433e9 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg index 4c1fd04ddc..1e65bd4210 100644 --- a/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg index a8c36f77de..d97282af1a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg index ef9fc94ba0..9e3a32f541 100644 --- a/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg index 6e319a2e48..63842f0023 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg index db8ea1aacc..6dab2c3fe7 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg index e935a8602f..5f20574af0 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg index 237ab6e10d..df2de76672 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg index 097f6dffd5..dd2da135d5 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg index 9305ef5fef..e14cc7350d 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg index b580b24080..643390577b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg index e33497009c..5ab36fb7bd 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg index f80b5e4abd..c7308fb5db 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index 665b0eae9e..1bf0dbc512 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 2727b90a8f..3b9709615b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index eb67a6bc1a..5ce22b5082 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -11,5 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index df51f12bff..df4933513c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.80mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 01bb7610c1..d39ad896d1 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.80mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 30 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index b8f568e5bc..d985acaf23 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -12,11 +12,4 @@ variant = V6 0.80mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 24 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg index eeaa221c40..88abf37994 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg index 32a01a4ccf..ee6c2a69a4 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg index 4de13d3438..9ae35138ea 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index d3811fca75..49978b1260 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 43fef60c62..fc0213d86c 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 2d0d7363bc..a4f20d1f3e 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg index 1b946b6972..d5fbb108e2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg index 0fdf2b09b8..1a64c290a9 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg index 2869f0c4cc..357b5c3663 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg index 75de4ecfd0..52e68b3992 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg index 5b49ce8b5b..455c62f80f 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg index 8c2ca97f73..8085e0e1f8 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg index cbe03a0530..f5a1bac266 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg index f6662e36b9..99601f8af1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg index 19e12d5fa1..21b1d7b76a 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg index 458073d1f5..a138b16f0b 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg index cf38d37b78..9b6f668d76 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg index cf8e697895..b2f3aa9460 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 50e5ee0349..f35c182ce4 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 8e43a38f81..12ea4d41b9 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index 88183f9230..8cba0fd007 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 15f4e04440..18b7f57c48 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 250 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 61f8de807f..48c838b7b0 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 300 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 03879a4821..1beac678ac 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 300 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg index a00da22abe..5ba4327c25 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg index c6e0d79028..c62ba372ed 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg index 6eda55da42..a282357abc 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index 9d33f945ee..ae76dc5b9a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index ca0177aad4..d9fd6c6a72 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 862c42568c..b70fd350bb 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg index 9686666d6f..0f5885c755 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg index 2b67e13741..ac74b49fb2 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg index 8facc35e32..7710f9e5c7 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg index a5ed6ea722..6b2f45dbf4 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg index 2cc05dcbf5..d5c40fda03 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg index 0d4f0b2202..50149252dd 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg index 5908772fc8..a6b704146c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg index c414b3092f..2e8fbd0278 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg index 4231717b7f..011f2cf14a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg index 332b077bd2..067330135d 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg index a675b15934..19c06370b8 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg index 7b309d0736..643929a43a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 16b85b62ba..0477759692 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index 9588f8bc25..51fd9ecfe0 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index ee6ac27c36..292eefe505 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 3b6bcc101b..c03ad8eece 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 165 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 328ec33396..7b4ba4b9b8 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 250 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 0499cc9473..cf9800136d 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 125 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg index f184df488b..8a62c28aa3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg index 18c52a26f4..d4055c09da 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg index a770cfac3c..5f48dba65f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index d5b86ed687..f305680d7e 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index cafa25c712..f9bb99f296 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 3ac44fb6b6..4868dce06d 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg index f9f8a3028d..2b9dfa8b9a 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg index 9132b3f55b..ce3ae747a8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg index c28e06b7f7..6f94a60eaf 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg index 9438e01e8b..eecea2c4f6 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg index 63ad8bf38d..37934457ce 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg index 5865856c0b..42529da7f5 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg index 9456ee116b..0f729c360f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg index f9566c0112..e44e4778ca 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg index 5cc65db7e0..e4e7b71cdf 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg index 4b555f0bdf..4a20edc16d 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg index b844a9c006..ff14ca388b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg index bc853a4c69..a1382e58b0 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index 82fa1ac323..10d8b08f65 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 0810c48234..f82f42abad 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index 97bdca38ca..5d5a71dd12 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index bb2dcae8aa..617506536a 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 125 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 2d1e7467ea..5dd0671b70 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 90 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 04ecb0d4a9..95637cbeb8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 70 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg index 414790104b..2a57de7571 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg index 1e51fb3cd8..159a6d1825 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg index 0d93be5f48..63a110c11b 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 6dad626b1e..de55f334ec 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 48d8470864..927683ae42 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index ccec351621..2dd5f3b673 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg index 476ade7fcb..3ad231b1df 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg index fd83b03791..3800c4e3bd 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg index 0af94f0d5b..c310679a57 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg index 1cb8edb442..aa620c4175 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg index a6f355d2b6..4dbb6de045 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg index 27ba96084c..add6b7a864 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg index b13e0f7aaf..e067327e07 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg index 1089a94d18..d2c81b550a 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg index e20ed4e6ec..a5453b6b04 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg index 6d6640a50c..dad3640a61 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg index 16708d883f..e2a9d4e359 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg index ff6eaaa0ea..ca8ef820a3 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index b653a9ac36..af080ec50d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index c044f537fe..119ef1dbed 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 4a439653df..969efa4cc5 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 700a2c7219..f0cd46f5a2 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 32d442147d..84e290ef45 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index bfdb5eff2b..fb39c894f6 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 50 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg index 50dcef6c2c..105ae75d59 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg index 68c1b6e1d7..f1205bc059 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg index edaa98bc5a..36d1741ae6 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index b1aa9438b3..4a3ae2de9e 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 6b5295da3a..d953fa4d3e 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index e0b46c7ed1..7ca50974c1 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg index 52311dfdca..0d4381ead5 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg index 7a2f43b24c..15c73581aa 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg index 70fc0c0283..66c9e48516 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg index f51ccc7c67..14bdc1a2d3 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg index 8ab7f98cfd..72ce329216 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg index 85fdcea94a..7666c2749d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg index dec810f101..8163935e59 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg index d0689f436e..9171d92ba9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg index 2afd76cfa1..1fc8953a01 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg index db099e829d..fe6dd16063 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg index 2eb19ec7d8..c67a3ffa31 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg index 6a91755e9d..554061b323 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index 471c56ea95..e5898fea95 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 7c6a0c7406..1468dffc06 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index 957372db73..94946d9238 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -11,5 +11,5 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index febbd31079..292d2c2952 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index fb3645c1a2..5f434ed2ef 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 50 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 3da5a0223e..7936ce1aba 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -12,11 +12,5 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print -speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 -speed_roofing = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 0.50) -speed_wall = =math.ceil(speed_print * 0.50) -speed_wall_0 = =speed_wall -speed_wall_x = =speed_print +speed_print = =round(20 / layer_height / machine_nozzle_size, -1) diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 8585a05eec..d2c9f02f64 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -98,6 +98,8 @@ cool_min_layer_time cool_min_speed cool_lift_head cool_during_extruder_switch +build_volume_fan_speed_0 +build_volume_fan_speed [support] support_enable @@ -117,6 +119,7 @@ gradual_support_infill_step_height support_interface_enable support_roof_enable support_bottom_enable +support_use_towers [platform_adhesion] prime_blob_enable @@ -134,6 +137,8 @@ prime_tower_position_x prime_tower_position_y prime_tower_brim_enable interlocking_enable +multi_material_paint_deepness +multi_material_paint_resolution [meshfix] diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 6c6124ab67..1b0db32da1 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -46,6 +46,7 @@ support_type support_angle support_offset support_structure +support_use_towers [platform_adhesion] prime_blob_enable @@ -57,6 +58,7 @@ prime_tower_enable prime_tower_position_x prime_tower_position_y interlocking_enable +multi_material_paint_deepness [meshfix] diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index b52c7bd526..1aaa6f999e 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -254,6 +254,8 @@ cool_min_layer_time cool_min_speed cool_lift_head cool_during_extruder_switch +build_volume_fan_speed_0 +build_volume_fan_speed [support] support_enable @@ -387,6 +389,8 @@ interlocking_orientation interlocking_beam_layer_count interlocking_dept interlocking_boundary_avoidance +multi_material_paint_deepness +multi_material_paint_resolution [meshfix] meshfix_union_all @@ -491,3 +495,6 @@ small_feature_speed_factor_0 scarf_joint_seam_length scarf_joint_seam_start_height_ratio scarf_split_distance +retraction_during_travel_ratio +keep_retracting_during_travel +prime_during_travel_ratio diff --git a/resources/themes/cura-light/images/logo.svg b/resources/themes/cura-light/images/logo.svg index b2ee9b871d..6f401e5a9d 100644 --- a/resources/themes/cura-light/images/logo.svg +++ b/resources/themes/cura-light/images/logo.svg @@ -1,5 +1,13 @@ - - - - + + + diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 436aaceb3c..d561f7e6dc 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -463,6 +463,8 @@ "layerview_support_infill": [0, 230, 230, 127], "layerview_move_combing": [0, 0, 255, 255], "layerview_move_retraction": [128, 127, 255, 255], + "layerview_move_while_retracting": [127, 255, 255, 255], + "layerview_move_while_unretracting": [255, 127, 255, 255], "layerview_support_interface": [63, 127, 255, 127], "layerview_prime_tower": [0, 255, 255, 255], "layerview_nozzle": [224, 192, 16, 64], diff --git a/resources/variants/ultimaker_s6_aa025.inst.cfg b/resources/variants/ultimaker_s6_aa025.inst.cfg new file mode 100644 index 0000000000..95ac4eeb3b --- /dev/null +++ b/resources/variants/ultimaker_s6_aa025.inst.cfg @@ -0,0 +1,194 @@ +[general] +definition = ultimaker_s6 +name = AA 0.25 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 0 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = AA 0.25 +machine_nozzle_size = 0.25 +machine_nozzle_tip_outer_diameter = 0.65 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = =retraction_speed +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 55 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_wall_0 +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = 20 +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 55) +speed_wall_0 = =math.ceil(speed_wall * 20 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = 1.2 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s6_aa04.inst.cfg b/resources/variants/ultimaker_s6_aa04.inst.cfg new file mode 100644 index 0000000000..ac227c8cd0 --- /dev/null +++ b/resources/variants/ultimaker_s6_aa04.inst.cfg @@ -0,0 +1,192 @@ +[general] +definition = ultimaker_s6 +name = AA 0.4 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +machine_nozzle_id = AA 0.4 +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.0 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = 15 +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 70 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_wall_0 +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 70) +speed_wall_0 = =math.ceil(speed_wall * 20 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = 1.2 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s6_aa08.inst.cfg b/resources/variants/ultimaker_s6_aa08.inst.cfg new file mode 100644 index 0000000000..760ce661b9 --- /dev/null +++ b/resources/variants/ultimaker_s6_aa08.inst.cfg @@ -0,0 +1,203 @@ +[general] +definition = ultimaker_s6 +name = AA 0.8 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_fan_speed = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +default_material_print_temperature = 200 +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +infill_wipe_dist = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 5000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +layer_height = 0.2 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = AA 0.8 +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +multiple_mesh_overlap = 0 +optimize_wall_printing_order = True +prime_tower_enable = False +prime_tower_min_volume = 6 +prime_tower_wipe_enabled = True +raft_surface_layers = 1 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_hop_only_when_collides = True +retraction_min_travel = 5 +retraction_prime_speed = 15 +retraction_speed = 25 +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 35 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_wall_0 +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 25 / 35) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 35) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = 20 +switch_extruder_retraction_amount = 16.5 +top_bottom_thickness = 1.4 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s6_cc04.inst.cfg b/resources/variants/ultimaker_s6_cc04.inst.cfg new file mode 100644 index 0000000000..37573be739 --- /dev/null +++ b/resources/variants/ultimaker_s6_cc04.inst.cfg @@ -0,0 +1,191 @@ +[general] +definition = ultimaker_s6 +name = CC 0.4 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +machine_nozzle_id = CC 0.4 +machine_nozzle_size = 0.4 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = =retraction_speed +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 45 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_topbottom +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = =layer_height * 6 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s6_cc06.inst.cfg b/resources/variants/ultimaker_s6_cc06.inst.cfg new file mode 100644 index 0000000000..595a181f63 --- /dev/null +++ b/resources/variants/ultimaker_s6_cc06.inst.cfg @@ -0,0 +1,191 @@ +[general] +definition = ultimaker_s6 +name = CC 0.6 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +machine_nozzle_id = CC 0.6 +machine_nozzle_size = 0.6 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = =retraction_speed +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 45 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_topbottom +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = =layer_height * 6 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s8_aa025.inst.cfg b/resources/variants/ultimaker_s8_aa025.inst.cfg new file mode 100644 index 0000000000..96e31fbb04 --- /dev/null +++ b/resources/variants/ultimaker_s8_aa025.inst.cfg @@ -0,0 +1,194 @@ +[general] +definition = ultimaker_s8 +name = AA 0.25 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 0 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = AA 0.25 +machine_nozzle_size = 0.25 +machine_nozzle_tip_outer_diameter = 0.65 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = =retraction_speed +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 55 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_wall_0 +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = 20 +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 55) +speed_wall_0 = =math.ceil(speed_wall * 20 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = 1.2 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s8_aa04.inst.cfg b/resources/variants/ultimaker_s8_aa04.inst.cfg new file mode 100644 index 0000000000..8e7df64b79 --- /dev/null +++ b/resources/variants/ultimaker_s8_aa04.inst.cfg @@ -0,0 +1,192 @@ +[general] +definition = ultimaker_s8 +name = AA 0.4 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +machine_nozzle_id = AA 0.4 +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.0 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = 15 +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 70 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_wall_0 +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 70) +speed_wall_0 = =math.ceil(speed_wall * 20 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = 1.2 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s8_aa08.inst.cfg b/resources/variants/ultimaker_s8_aa08.inst.cfg new file mode 100644 index 0000000000..ca0e09485e --- /dev/null +++ b/resources/variants/ultimaker_s8_aa08.inst.cfg @@ -0,0 +1,203 @@ +[general] +definition = ultimaker_s8 +name = AA 0.8 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_fan_speed = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +default_material_print_temperature = 200 +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +infill_wipe_dist = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 5000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +layer_height = 0.2 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = AA 0.8 +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +multiple_mesh_overlap = 0 +optimize_wall_printing_order = True +prime_tower_enable = False +prime_tower_min_volume = 6 +prime_tower_wipe_enabled = True +raft_surface_layers = 1 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_hop_only_when_collides = True +retraction_min_travel = 5 +retraction_prime_speed = 15 +retraction_speed = 25 +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 35 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_wall_0 +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 25 / 35) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 35) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = 20 +switch_extruder_retraction_amount = 16.5 +top_bottom_thickness = 1.4 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s8_cc04.inst.cfg b/resources/variants/ultimaker_s8_cc04.inst.cfg new file mode 100644 index 0000000000..91a7186c0d --- /dev/null +++ b/resources/variants/ultimaker_s8_cc04.inst.cfg @@ -0,0 +1,191 @@ +[general] +definition = ultimaker_s8 +name = CC 0.4 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +machine_nozzle_id = CC 0.4 +machine_nozzle_size = 0.4 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = =retraction_speed +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 45 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_topbottom +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = =layer_height * 6 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner + diff --git a/resources/variants/ultimaker_s8_cc06.inst.cfg b/resources/variants/ultimaker_s8_cc06.inst.cfg new file mode 100644 index 0000000000..3ccfe3e2d6 --- /dev/null +++ b/resources/variants/ultimaker_s8_cc06.inst.cfg @@ -0,0 +1,191 @@ +[general] +definition = ultimaker_s8 +name = CC 0.6 +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +acceleration_flooring = =acceleration_topbottom +acceleration_infill = =acceleration_print +acceleration_layer_0 = =acceleration_topbottom +acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_print = 3500 +acceleration_print_layer_0 = =acceleration_layer_0 +acceleration_roofing = =acceleration_topbottom +acceleration_skirt_brim = =acceleration_layer_0 +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =extruderValue(support_bottom_extruder_nr, 'acceleration_support_interface') +acceleration_support_infill = =acceleration_support +acceleration_support_interface = =acceleration_topbottom +acceleration_support_roof = =extruderValue(support_roof_extruder_nr, 'acceleration_support_interface') +acceleration_topbottom = =math.ceil(acceleration_print * 1000 / 3500) +acceleration_travel = =acceleration_print if magic_spiralize else 5000 +acceleration_travel_enabled = False +acceleration_travel_layer_0 = =acceleration_layer_0 * acceleration_travel / acceleration_print +acceleration_wall = =math.ceil(acceleration_print * 1500 / 3500) +acceleration_wall_0 = =math.ceil(acceleration_wall * 1000 / 1000) +acceleration_wall_0_flooring = =acceleration_wall_0 +acceleration_wall_0_roofing = =acceleration_wall_0 +acceleration_wall_x = =acceleration_wall +acceleration_wall_x_flooring = =acceleration_wall_x +acceleration_wall_x_roofing = =acceleration_wall_x +adhesion_type = brim +bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_skin_density = 80 +bridge_skin_material_flow = =skin_material_flow +bridge_skin_material_flow_2 = =skin_material_flow +bridge_skin_speed = =speed_topbottom +bridge_skin_speed_2 = =speed_topbottom +bridge_skin_support_threshold = 50 +bridge_sparse_infill_max_density = 0 +bridge_wall_material_flow = =wall_material_flow +bridge_wall_min_length = =line_width + support_xy_distance + 1.0 +bridge_wall_speed = =bridge_skin_speed +brim_width = 7 +cool_min_layer_time = 6 +cool_min_layer_time_overhang = =cool_min_layer_time +cool_min_layer_time_overhang_min_segment_length = 5 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +cool_min_temperature = =max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15]) +extra_infill_lines_to_support_skins = none +flooring_layer_count = 0 +flooring_material_flow = =skin_material_flow +flooring_monotonic = True +gradual_flow_discretisation_step_size = 0.2 +gradual_flow_enabled = False +hole_xy_offset = 0 +infill_material_flow = =(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 20 +infill_wall_line_count = 0 +initial_bottom_layers = =bottom_layers +jerk_flooring = =jerk_topbottom +jerk_infill = =jerk_print +jerk_layer_0 = =jerk_print +jerk_prime_tower = =jerk_print +jerk_print = 4000 +jerk_print_layer_0 = =max(4000, jerk_wall_0) +jerk_roofing = =jerk_topbottom +jerk_skirt_brim = =jerk_layer_0 +jerk_support = =jerk_print +jerk_support_bottom = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_support_infill = =jerk_support +jerk_support_interface = =jerk_support +jerk_support_roof = =extruderValue(support_roof_extruder_nr, 'jerk_support_interface') +jerk_topbottom = =jerk_print +jerk_travel = =jerk_print +jerk_travel_enabled = False +jerk_travel_layer_0 = =jerk_layer_0 * jerk_travel / jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_0_flooring = =jerk_wall_0 +jerk_wall_0_roofing = =jerk_wall_0 +jerk_wall_x = =jerk_wall +jerk_wall_x_flooring = =jerk_wall_x +jerk_wall_x_roofing = =jerk_wall_x +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +machine_nozzle_id = CC 0.6 +machine_nozzle_size = 0.6 +material_extrusion_cool_down_speed = 0.7 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_pressure_advance_factor = 0.05 +max_flow_acceleration = 1 +max_skin_angle_for_expansion = 90 +meshfix_maximum_resolution = =max(speed_wall_0 / 75, 0.5) +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_min_volume = 6 +retraction_amount = 6.5 +retraction_combing_avoid_distance = =machine_nozzle_size * 1.5 +retraction_combing_max_distance = 15 +retraction_hop = 2 +retraction_hop_after_extruder_switch_height = =retraction_hop +retraction_hop_enabled = =extruders_enabled_count > 1 +retraction_min_travel = 5 +retraction_prime_speed = =retraction_speed +roofing_monotonic = True +roofing_pattern = =top_bottom_pattern +seam_overhang_angle = =support_angle +skin_edge_support_thickness = =4 * layer_height if infill_sparse_density < 30 else 0 +skin_material_flow = =0.95 * material_flow +skin_outline_count = =0 if top_bottom_pattern == 'concentric' and top_bottom_pattern_0 == 'concentric' and roofing_layer_count <= 0 else 1 +skin_overlap = 20 +skin_preshrink = =wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x +skirt_brim_minimal_length = 250 +skirt_brim_speed = =speed_layer_0 +skirt_line_count = 1 +small_skin_on_surface = False +small_skin_width = =skin_line_width * 2 +speed_flooring = =speed_topbottom +speed_infill = =speed_print +speed_ironing = =speed_topbottom * 20 / 30 +speed_layer_0 = =min(30, layer_height / layer_height_0 * speed_wall_0) +speed_prime_tower = =speed_topbottom +speed_print = 45 +speed_print_layer_0 = =speed_layer_0 +speed_roofing = =speed_topbottom +speed_support = =speed_topbottom +speed_support_bottom = =extruderValue(support_bottom_extruder_nr, 'speed_support_interface') +speed_support_infill = =speed_support +speed_support_interface = =speed_topbottom +speed_support_roof = =extruderValue(support_roof_extruder_nr, 'speed_support_interface') +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_travel = 150 +speed_travel_layer_0 = =speed_travel +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_0_flooring = =speed_wall_0 +speed_wall_0_roofing = =speed_wall_0 +speed_wall_x = =speed_wall +speed_wall_x_flooring = =speed_wall_x +speed_wall_x_roofing = =speed_wall_x +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_bottom_offset = =extruderValue(support_bottom_extruder_nr, 'support_interface_offset') +support_brim_width = =(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3 +support_interface_enable = False +support_interface_offset = =support_offset +support_line_width = =line_width +support_offset = =support_line_width + 0.4 if support_structure == 'normal' else 0.0 +support_pattern = zigzag +support_structure = normal +support_top_distance = =support_z_distance +support_tree_angle = =max(min(support_angle, 85), 20) +support_tree_angle_slow = =support_tree_angle * 2 / 3 +support_tree_bp_diameter = 7.5 +support_tree_branch_diameter = 5 +support_tree_branch_diameter_angle = 7 +support_tree_max_diameter = 25 +support_tree_tip_diameter = =support_line_width * 2 +support_tree_top_rate = =30 if support_roof_enable else 10 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = =layer_height * 6 +travel_avoid_other_parts = True +travel_avoid_supports = False +wall_0_acceleration = 20.0 +wall_0_deceleration = 20.0 +wall_0_end_speed_ratio = 100.0 +wall_0_inset = 0 +wall_0_speed_split_distance = 1.0 +wall_0_start_speed_ratio = 100.0 +wall_0_wipe_dist = =machine_nozzle_size / 2 +wall_material_flow = =material_flow +wall_overhang_angle = 90 +wall_x_material_flow = =wall_material_flow +xy_offset = =-layer_height * 0.1 +z_seam_corner = z_seam_corner_weighted +z_seam_position = back +z_seam_type = sharpest_corner +